Fix client backoff (#5261)

* fix client backoff

* fix tests

* cleaning up
1 file changed