AMENDED AND RESTATED NON-REDEMPTION AGREEMENT