Revert "Revert "probably fails to add the custom embedded streaming thing""

This reverts commit 08db1d6e17af4cd68f0ce5ecbdc6c345986b4e98.