Revert a series of commits to MCJIT to get the build working in CMake