!str #15604: Removal of default fanout

does this need to be done in a `finally` block?