I will do some more investigation of this failure mode but in light of doing away with bonding being the direction we are already going, I don't think I want to alter how bonding is done on what will soon be a legacy setup.