diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 9a848af7f0e08..22685d8a61d21 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -10007,9 +10007,11 @@ public final class Settings {
/**
* Whether or not a SFPS device is enabling the performant auth setting.
+ * The "_V2" suffix was added to re-introduce the default behavior for
+ * users. See b/265264294 fore more details.
* @hide
*/
- public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled";
+ public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled_v2";
/**
* Whether or not debugging is enabled.
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 6d21fb657a885..194a9867f0f3e 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -5025,10 +5025,8 @@
true
-
- false
+
+ false