Re-enabling uploader + idempotency