to the output stream if return_output was set. This branch undid that and this commit restores those semantics.