Revert "Fix compile error with LLVM 3.6."

This reverts commit cc829485cc70dd74699f315534ae1634a75e78a5.