diff --git a/Auth/FirebaseAuthUI/FUIAuth.m b/Auth/FirebaseAuthUI/FUIAuth.m
index f4203ffbbb1..2c264a6bc83 100644
--- a/Auth/FirebaseAuthUI/FUIAuth.m
+++ b/Auth/FirebaseAuthUI/FUIAuth.m
@@ -126,16 +126,13 @@ - (BOOL)handleOpenURL:(NSURL *)URL
 - (UINavigationController *)authViewController {
   static UINavigationController *authViewController;
 
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    UIViewController *controller;
-    if ([self.delegate respondsToSelector:@selector(authPickerViewControllerForAuthUI:)]) {
-      controller = [self.delegate authPickerViewControllerForAuthUI:self];
-    } else {
-      controller = [[FUIAuthPickerViewController alloc] initWithAuthUI:self];
-    }
-    authViewController = [[UINavigationController alloc] initWithRootViewController:controller];
-  });
+  UIViewController *controller;
+  if ([self.delegate respondsToSelector:@selector(authPickerViewControllerForAuthUI:)]) {
+    controller = [self.delegate authPickerViewControllerForAuthUI:self];
+  } else {
+    controller = [[FUIAuthPickerViewController alloc] initWithAuthUI:self];
+  }
+  authViewController = [[UINavigationController alloc] initWithRootViewController:controller];
 
   return authViewController;
 }