This reverts commit befa8cf0. Apparently this breaks some libc++ builds with an apparent assertion, so I'm looking into that .