Note that for lint, the core code doesn't know about the batches field sets. That can be changed back though