This reverts commit b3b2538d, it introduced a cycklic module depenency that broke the -DLLVM_ENABLE_MODULES=1 build.