Only use a batch when needed for consistency

Bug: https://phabricator.wikimedia.org/T76688