Revert changes -- one incorrect and one unnecessary