This reverts commit 21e16ab6b8. It looks like it would break builds in mac. See https://reviews.llvm.org/D118352.
21e16ab6b8