Fix another deadlock-when-many-people-upload bug, like the one we fixed in r14