This reverts commit 7691b69d. Bots are broken because we're missing CMake dependencies all around now.