Reintroduce missing encoding specs for mass-upload (and cleanup)