This reverts commit c5abe893. This reverts commit a033dbbe. This broke the build with -DLLVM_LINK_LLVM_DYLIB=ON. Reverting while I investigate.