K 10 svn:author V 6 kevans K 8 svn:date V 27 2018-07-05T18:55:42.101569Z K 7 svn:log V 52 Revert r336011,r336012 until I can competently test END