Revert "Revert "OK, try closing the stream in the channel instead of the transaction""

This reverts commit f0204896edcac908b412db2d6dd91f28c927abdd.

We really do want to do this at least at the channel level