Fix LLVM3.6 build

(restores what was there before)