This reverts commit 6d263b6f while I investigate the CMake failures that it causes in some configurations.