Fix uploader controller (more old)
- Just take uploadercontroller from 2.05/master