Undid some apparent changes from the last commit.