Undo partially the changes for dealing with $prefix (CMake)