AMENDED AND RESTATED CONTRIBUTION AGREEMENT