This reverts commit 17eb198d. Reverted for investigation, because ClangDriverTests failed on some builders.