Revert CMake changes (didn't work for osx anyway)