Revert part of previous commit.