AMENDED AND RESTATED ROLLOVER CONTRIBUTION AGREEMENT