K 10
svn:author
V 8
jpaetzel
K 8
svn:date
V 27
2017-01-20T00:17:53.642873Z
K 7
svn:log
V 122
Revert MFC of 310847 and 310864

Requested by glebius who had questions about the original
head commit that I didn't see.

END