unfinished streaming hack

Change-Id: If7aad76eee703ca4459f31061bdd9cdf47336b88