Revert "shorter socket timeouts"

This reverts commit 4148c817eaff9cacb2b55634fda5600bad062cb6.
Merge branch 'master' into primus