Revert part of earlier commit.