Revert the previous patch while I figure out how to make llvm-gcc