Revert extra changes from previous commit.