Merge "Revert "Attach defer_outgoing_bcasts flag."" into main