diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 7d62ada..7db3d5b 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -82,7 +82,7 @@
      */
     public static final int SCHEMA_VERSION = 27;
 
-    public static final String AUTHORITY = FeatureFlags.AUTHORITY;
+    public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".settings";
 
     static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";
 
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index 8de352e..23ad912 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -58,7 +58,6 @@
     }
 
     public static final boolean IS_DOGFOOD_BUILD = false;
-    public static final String AUTHORITY = "com.android.launcher3.settings".intern();
 
     // When enabled the promise icon is visible in all apps while installation an app.
     public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false;
@@ -104,12 +103,6 @@
                     flag.initialize(context);
                 }
             }
-        } else {
-            synchronized (sLock) {
-                for (TogglableFlag flag : sFlags) {
-                    flag.currentValue = flag.defaultValue;
-                }
-            }
         }
     }
 
@@ -139,7 +132,7 @@
                 boolean defaultValue,
                 String description) {
             this.key = checkNotNull(key);
-            this.defaultValue = defaultValue;
+            this.currentValue = this.defaultValue = defaultValue;
             this.description = checkNotNull(description);
             synchronized (sLock) {
                 sFlags.add(this);