Bring back the batch flusher