Revert "streaming fixes,e tc"

This reverts commit 498356f689ea3f74dec21e1b23893898624533da.