AMENDED AND RESTATED CHANGE-IN-CONTROL SEVERANCE AGREEMENT