Batch disabled on demand restricting

Fixes #1467