Reverted some changes to some of our CMake files.