This reverts commit 6290ebf6. It behaves badly depending on the CMake Version, and on our buildbots...