Revert "Merge pull request #296 from chrisroberts/explicit-upload"

This reverts commit 627b444cd49af68fe3708d3d23750893d827bbf3, reversing
changes made to cf68305bc8ce7873412e9951739d1cc08d3a40bf.