More work to make upload progress work with rest based uploads