This reverts commit 226409c628. Breaks check-clang on mac, see comments on https://reviews.llvm.org/D136683
226409c628