Fix regression which lead to leak buffers when nothing could be read from the Channel.

This was introduced as part of #1812, but fortunatualy was not part of any release.
Merge remote-tracking branch: upstream/master