Revert "Merge branch 'master' into upload_fix"

This reverts commit 2354e421d4c995bd1a900b658d4a00034258cbf8, reversing
changes made to 42e38e9a65c1a1ef6c929bd0d7c1134fb10405eb.