This reverts commit e2917311f026cc445fa8aeefa0457b0c7a60824a. This caused some problems with lldb testing the diagnostic output: https://lab.llvm.org/buildbot/#/builders/68/builds/52754
This reverts commit e2917311f026cc445fa8aeefa0457b0c7a60824a. This caused some problems with lldb testing the diagnostic output: https://lab.llvm.org/buildbot/#/builders/68/builds/52754