AMENDED AND RESTATED UNIT GRANT AGREEMENT