Re-add previous behavior for retry same server + retry next server