This reverts commit 5326c9e4. The problem that caused the revert was downstream (missing dep in user of clang).