Tweak bug6783 patch.