This reverts commit eb9b063539c34d0d4dd14e8516eeb77bb8b9e4bd. The commit fails to build on build bots using LLVM 8.