This reverts commit b349d4c5. This broke a bot that exposes some missing CMake dependencies that need to be fixed first.