2005 AMENDED AND RESTATED AGREEMENT OF LIMITED PARTNERSHIP OF MACWH, LP