AMENDED AND RESTATED NON-QUALIFIED STOCK OPTION AGREEMENT