Revert CMake script to original