Fix bug 1636: remove the default 30s timeout in retry