Revert "Simplify output streams"

This reverts commit 4c197f3b7ac1511af972a0775fc546b0762894dc.