AMENDED AND RESTATED WAIVER AND MODIFICATION AGREEMENT