This reverts commit 9892d1644f62cf8f5133ee0d2ebafb56f6500cc1, which causes clang test failures in libcxx tests.