Fixes #8580
This reverts commit 5d9d6ac12b.
5d9d6ac12b
If batch sizes are too large, we'll get a Binder exception. Fixes #8580