Manually revert the changes to CMakeLists.txt from commit 40602 - they should not...