This reverts commit a425cac3. There is another libc++ test, that this time causes us to hit an assertion. Reverting, likely for a while this time.