Use bufferless stream to improve perf and resource usage

Fixes #518