Revert changes in main CMakeLists.txt