Revert "BATCH-2099"

This reverts commit 8575ac2dce0a0d5f42faa335df6a82440ee982c8.