AMENDED AND RESTATED WAREHOUSING AGREEMENT