Partially revert CMake change