httpstream: reintroduce d318d544cf76ea58c4f12bccc0541d888af7570c: