Revert "Support for llvm3.4.1; clang-format issue"

This reverts commit b633c99300c8891b1f2343a2381abcad25bb6faa.