Revert "Fixes bugs introduced in last commit"

This reverts commit 8f50e03a1e9051432c79ff4e9d9d60d57f1cd4ad.
Revert "Ensures no sending when batch_size is 0"

This reverts commit 5b0f65859a4d49b6205a1761560146f117ab33cd.