Merge pull request #1525 from emilio/llvm-bug-workaround

Work-around https://bugs.llvm.org/show_bug.cgi?id=40813.