K 10
svn:author
V 5
markj
K 8
svn:date
V 27
2020-08-18T14:09:49.648873Z
K 7
svn:log
V 205
Revert r364310.

Some of the resulting fallout in CAM does not appear straightforward to
fix, so simply revert the commit for now in the absence of a better
solution.

Discussed with:	mjg
Reported by:	dhw

END