Put back uploader changes