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

This reverts commit 4d79acab745947271f72f2fa607f958901f5edee.

Take us back to the original try.