AMENDED AND RESTATED MAKE WHOLE AGREEMENT