K 10
svn:author
V 3
dim
K 8
svn:date
V 27
2015-01-30T18:26:38.327955Z
K 7
svn:log
V 188
Partially revert r273382, to reduce diffs against upstream.  This was a
temporary fix to solve a conflict with an older version of libc++, and
it is no longer relevant.

MFC after:	3 days

END