Enable new batch-upload code