Revert previous commit, fix build.