Back to Old Version of CMakeLists