AMENDED AND RESTATED MODIFICATION AND LIMITED WAIVER AGREEMENT