AMENDED AND RESTATED WAIVER AND CONSENT