Reverts major changes to previous commit.