Backport 'TOOLS-2381 Restore no socket timeout behavior'
TOOLS-2381 Restore no socket timeout behavior