Remove recursive stream allocations

Commit

7 years ago

Remove recursive stream allocations (cherry picked from commit 465492853fafebbf996a8cff646b85bde2e2dafd)