Really fix the LLVM 3.2 build this time.