diff --git a/deps/rabbit/src/mirrored_supervisor.erl b/deps/rabbit/src/mirrored_supervisor.erl
index 661120360f11..201947072977 100644
--- a/deps/rabbit/src/mirrored_supervisor.erl
+++ b/deps/rabbit/src/mirrored_supervisor.erl
@@ -345,10 +345,16 @@ handle_info({'DOWN', _Ref, process, Pid, _Reason},
                            child_order = ChildOrder}) ->
     %% No guarantee pg will have received the DOWN before us.
     R = case lists:sort(pg:get_members(Group)) -- [Pid] of
-            [O | _] -> ChildSpecs = retry_update_all(O, Pid),
-                       [start(Delegate, ChildSpec)
-                        || ChildSpec <- restore_child_order(ChildSpecs,
-                                                            ChildOrder)];
+            [O | _] -> ChildSpecs = update_all(O, Pid),
+                       case ChildSpecs of
+                           _ when is_list(ChildSpecs) ->
+                               [start(Delegate, ChildSpec)
+                                || ChildSpec <- restore_child_order(
+                                                  ChildSpecs,
+                                                  ChildOrder)];
+                           {error, _} ->
+                               [ChildSpecs]
+                       end;
             _       -> []
         end,
     case errors(R) of
@@ -428,22 +434,6 @@ check_stop(Group, Delegate, Id) ->
 
 id({Id, _, _, _, _, _}) -> Id.
 
-retry_update_all(O, Pid) ->
-    retry_update_all(O, Pid, 10000).
-
-retry_update_all(O, Pid, TimeLeft) when TimeLeft > 0 ->
-    case update_all(O, Pid) of
-        List when is_list(List) ->
-            List;
-        {error, timeout} ->
-            Sleep = 200,
-            TimeLeft1 = TimeLeft - Sleep,
-            timer:sleep(Sleep),
-            retry_update_all(O, Pid, TimeLeft1)
-    end;
-retry_update_all(O, Pid, _TimeLeft) ->
-    update_all(O, Pid).
-
 update_all(Overall, OldOverall) ->
     rabbit_db_msup:update_all(Overall, OldOverall).