This reverts commit be9f55f4. The commit was both not approved by the libc++ review group, and also the only change it contained was incorrect.