Revert 76a42b86139e324734f25c5bbedaea45162578e8 (batchingSize in Stream)