I think it would be better to just allow both the server and the client to upload them in bulk, rather then one at a time.
It would be a lot more efficient to have batch uploads, but the work around above at least keeps backward compatibility.
