K 10
svn:author
V 6
rstone
K 8
svn:date
V 27
2016-12-02T15:38:34.542499Z
K 7
svn:log
V 130
Revert r309372

The bug intended to be fixed by r309372 was already addressed by r296178,
so revert my change.

Reported by:	seph

END