Reverts some changes made in commit cb368c4 as they were unnecessary and a mistake.