Revert incorrect change from previous commit
Properly cleanup streams when we're done discarding data from them