K 10
svn:author
V 5
markj
K 8
svn:date
V 27
2018-11-10T20:33:08.531509Z
K 7
svn:log
V 240
Re-apply r336984, reverting r339934.

r336984 exposed the bug fixed in r340241, leading to the initial revert
while the bug was being hunted down.  Now that the bug is fixed, we
can revert the revert.

Discussed with:	alc
MFC after:	3 days

END