Comment 1 for bug 1787977

The only argument against backporting is that we identified this as a potential situation at PTG in Denver (the first one), and said we would deal with it if/when it came up. At the time we had the most information from CERN, which is mostly immune to this situation.

That said, the batching is a lot less complicated than I originally expected and there isn't really any technical reason not to backport it so I think we should.