simplify stream patches
3.3.0