This reverts commit 1ac403bd, which broke some non-libc++ build bots because they use an ancient CMake.