AMENDED AND RESTATED VESTING AGREEMENT