AMENDED AND RESTATED NON-EXECUTIVE CHAIRMAN AGREEMENT