AMENDED AND RESTATED WAIVER AGREEMENT