Revert back maxRetry to default value of 4, backport #1508