Reverting changes to generic/stream responses
Merge pull request #1044 from wpreul/master

Reverting changes to generic/stream responses