Revert a few changes in my last commit.