Revert the fix for #1548891, it broke backwards compatibility with arbitrary read buffers.
Fixes #1730114.
4 files changed