Fix the non-LLVM 3.5 builds