!str #15604: Removal of default fanout behavior
Merge pull request #15793 from drewhk/wip-15604-no-fanout-drewhk

!str #15604: Removal of default fanout