This reverts commit 5e3a0498.

That does not behave well with streams not updating position... "growing"

(cherry picked from commit 3b5024d9)