0004f698 causes `arg_timeout` to be infinity instead of 0 when timeout=0. The logic here now matches this change. Fixes #6381 (cherry picked from commit 0864d311)
