Block revision 79132 in preparation for a manual merge.