Revert "fix upload() -- mind the timeout"
Revert "fix upload() -- mind the timeout"

This reverts commit 7888e32fff69a18c6c74531d742d85740dcc4936.

awlayton/node-horseman,johntitus/node-horseman,awlayton/node-horseman,johntitus/node-horseman