Record-only MFC r336011-r336013
r336013 reverts the previous two commits, which broke the build due to poor testing form.