Undid the changes to MasterClient retry logic