Partially revert previous commit.