Revert part of my previous commit.