Removed unneeded timeout.
Merge pull request #3343 from brendandahl/remove-timeout

Removed unneeded timeout.