Fix build, revert previous commit.