Tweak changes that went in on revision 42891