AMENDED AND RESTATED WATER GATHERING AND DISPOSAL AGREEMENT