K 10 svn:author V 6 ultima K 8 svn:date V 27 2018-06-16T17:35:22.674966Z K 7 svn:log V 61 Cleanup and revert regression from r472401 Reported by: mat END