Fixes #5209 - setting infinite timeouts