Merge "Revert "Always validate uploads over api""