This reverts commit 2fbd254aa4, which broke the libc++ CI. I'm reverting to get things stable again until we've figured out a way forward. Differential Revision: https://reviews.llvm.org/D108696
2fbd254aa4