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