Revert r183298 and r183300 as the former broke the virtual function lookup in libcxx __locale