K 10 svn:author V 8 bdrewery K 8 svn:date V 27 2017-01-03T23:21:33.928197Z K 7 svn:log V 64 Revert MFC of r308603. This depends on unmerged r307538 still. END