Remove unnecessary save-and-restore of the