Revert part of my last commit.