diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
index 6af13220e43c..4bbd95620797 100644
--- a/modules/libpref/init/StaticPrefList.yaml
+++ b/modules/libpref/init/StaticPrefList.yaml
@@ -10569,15 +10569,7 @@
 # entry in python/mozbuild/mozbuild/mozinfo.py
 - name: widget.non-native-theme.enabled
   type: RelaxedAtomicBool
-#if defined(XP_LINUX) && defined(NIGHTLY_BUILD) && !defined(ANDROID)
-  value: true
-#elif defined(XP_MACOSX) && defined(NIGHTLY_BUILD)
-  value: true
-#elif defined(XP_WIN) && defined(NIGHTLY_BUILD)
-  value: true
-#else
-  value: false
-#endif
+  value: @IS_NIGHTLY_BUILD@
   mirror: always
 
 # The size in CSS pixels at full zoom of the minimum scrollbar width.
diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py
index d15162020b5d..e6b4d214bfa8 100644
--- a/python/mozbuild/mozbuild/mozinfo.py
+++ b/python/mozbuild/mozbuild/mozinfo.py
@@ -96,7 +96,7 @@ def build_dict(config, env=os.environ):
     d["artifact"] = substs.get("MOZ_ARTIFACT_BUILDS") == "1"
     d["ccov"] = substs.get("MOZ_CODE_COVERAGE") == "1"
     d["cc_type"] = substs.get("CC_TYPE")
-    d["non_native_theme"] = d["os"] not in ["android"] and d["nightly_build"]
+    d["non_native_theme"] = d["nightly_build"]
 
     def guess_platform():
         if d["buildapp"] == "browser":