yet another reorg of the upload process