This reverts commit 8b2ba6a144.
The uild errors (see below) were likely due to the same issue PR #88074 fixed. Addressed by following that PR.
https://lab.llvm.org/buildbot/#/builders/165/builds/52789
https://lab.llvm.org/buildbot/#/builders/91/builds/25273
498 B
498 B