This reverts commit 6db7a5cd. This adversely impacted the NetBSD libc++ bot for some reason, reverting while investigating.