Uplift patches that remove stream.ts usage