K 10 svn:author V 6 kevans K 8 svn:date V 27 2019-12-19T02:32:37.182511Z K 7 svn:log V 162 Record-only MFC of r354578 This reverted part of r354577, which has already been MFC'd along with the follow-up that ultimately re-added the part reverted here. END