diff --git a/Auth/FirebaseAuthUI/FUIAuthUtils.h b/Auth/FirebaseAuthUI/FUIAuthUtils.h
index ea4a57ff55f..6d8f6e2fb2c 100644
--- a/Auth/FirebaseAuthUI/FUIAuthUtils.h
+++ b/Auth/FirebaseAuthUI/FUIAuthUtils.h
@@ -49,9 +49,4 @@ extern NSString *const FUIAuthBundleName;
  */
 + (UIImage *)imageNamed:(NSString *)name fromBundle:(nullable NSBundle *)bundle;
 
-/** @fn isFirebasePerformanceAvailable
- * @brief Used to work around https://github.com/firebase/firebase-ios-sdk/issues/2283
- */
-+ (BOOL)isFirebasePerformanceAvailable;
-
 @end
diff --git a/Auth/FirebaseAuthUI/FUIAuthUtils.m b/Auth/FirebaseAuthUI/FUIAuthUtils.m
index f866139498f..af67a40b7e7 100644
--- a/Auth/FirebaseAuthUI/FUIAuthUtils.m
+++ b/Auth/FirebaseAuthUI/FUIAuthUtils.m
@@ -56,8 +56,4 @@ + (UIImage *)imageNamed:(NSString *)name fromBundleNameOrNil:(nullable NSString
   return [UIImage imageWithContentsOfFile:path];
 }
 
-+ (BOOL)isFirebasePerformanceAvailable {
-  return NSClassFromString(@"FIRPerformance") != nil;
-}
-
 @end
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
index b3faceceb95..cff6bc0e19c 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailEntryViewController.m
@@ -291,9 +291,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
   cell.textField.returnKeyType = UIReturnKeyNext;
   cell.textField.keyboardType = UIKeyboardTypeEmailAddress;
   if (@available(iOS 11.0, *)) {
-    if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-      cell.textField.textContentType = UITextContentTypeUsername;
-    }
+    cell.textField.textContentType = UITextContentTypeUsername; 
   }
   [cell.textField addTarget:self
                      action:@selector(textFieldDidChange)
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.m
index 2be8bcfac78..3b75497acb2 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordRecoveryViewController.m
@@ -182,9 +182,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
   _emailField.autocorrectionType = UITextAutocorrectionTypeNo;
   _emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
   if (@available(iOS 11.0, *)) {
-    if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-      _emailField.textContentType = UITextContentTypeUsername;
-    }
+    _emailField.textContentType = UITextContentTypeUsername;
   }
   [cell.textField addTarget:self
                      action:@selector(textFieldDidChange)
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m
index 4736f59e339..c4c944362e0 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignInViewController.m
@@ -258,9 +258,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     _emailField.autocorrectionType = UITextAutocorrectionTypeNo;
     _emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
     if (@available(iOS 11.0, *)) {
-      if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-        _emailField.textContentType = UITextContentTypeUsername;
-      }
+      _emailField.textContentType = UITextContentTypeUsername;
     }
   } else if (indexPath.row == 1) {
     cell.label.text = FUILocalizedString(kStr_Password);
@@ -270,9 +268,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     _passwordField.returnKeyType = UIReturnKeyNext;
     _passwordField.keyboardType = UIKeyboardTypeDefault;
     if (@available(iOS 11.0, *)) {
-      if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-        _passwordField.textContentType = UITextContentTypePassword;
-      }
+      _passwordField.textContentType = UITextContentTypePassword;
     }
   }
   [cell.textField addTarget:self
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
index c425512c7e2..6cdfbebc895 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordSignUpViewController.m
@@ -268,9 +268,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     _emailField.autocorrectionType = UITextAutocorrectionTypeNo;
     _emailField.autocapitalizationType = UITextAutocapitalizationTypeNone;
     if (@available(iOS 11.0, *)) {
-      if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-        _emailField.textContentType = UITextContentTypeUsername;
-      }
+      _emailField.textContentType = UITextContentTypeUsername;
     }
   } else if (indexPath.row == 1) {
     cell.label.text = FUILocalizedString(kStr_Name);
@@ -294,9 +292,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
     _passwordField.returnKeyType = UIReturnKeyNext;
     _passwordField.keyboardType = UIKeyboardTypeDefault;
     if (@available(iOS 11.0, *)) {
-      if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-        _passwordField.textContentType = UITextContentTypePassword;
-      }
+      _passwordField.textContentType = UITextContentTypePassword;
     }
   }
   [cell.textField addTarget:self
diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordVerificationViewController.m b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordVerificationViewController.m
index 56fc256b771..1fe9057cbcd 100755
--- a/EmailAuth/FirebaseEmailAuthUI/FUIPasswordVerificationViewController.m
+++ b/EmailAuth/FirebaseEmailAuthUI/FUIPasswordVerificationViewController.m
@@ -222,9 +222,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView
   _passwordField.returnKeyType = UIReturnKeyNext;
   _passwordField.keyboardType = UIKeyboardTypeDefault;
   if (@available(iOS 11.0, *)) {
-    if (![FUIAuthUtils isFirebasePerformanceAvailable]) {
-      _passwordField.textContentType = UITextContentTypePassword;
-    }
+    _passwordField.textContentType = UITextContentTypePassword;
   }
   [cell.textField addTarget:self
                      action:@selector(textFieldDidChange)