We don't need this behavior.
Refactored read-stream handling.