diff --git a/browser/confvars.sh b/browser/confvars.sh
index 0d9f8f8cf51..0aa5f7a8c3d 100755
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -37,7 +37,6 @@
 # ***** END LICENSE BLOCK *****
 
 MOZ_APP_NAME=firefox
-MOZ_XUL_APP=1
 MOZ_UPDATER=1
 MOZ_PHOENIX=1
 MOZ_PLACES=1
diff --git a/calendar/confvars.sh b/calendar/confvars.sh
index 24ca4c4f6b1..6198b453af8 100755
--- a/calendar/confvars.sh
+++ b/calendar/confvars.sh
@@ -38,7 +38,6 @@
 
 MOZ_APP_NAME=sunbird
 MOZ_APP_DISPLAYNAME=Calendar
-MOZ_XUL_APP=1
 MOZ_UPDATER=1
 MOZ_SUNBIRD=1
 MOZ_CALENDAR=1
diff --git a/camino/confvars.sh b/camino/confvars.sh
index 79fd2928c8f..1d55da6349e 100755
--- a/camino/confvars.sh
+++ b/camino/confvars.sh
@@ -45,6 +45,6 @@ MOZ_PROFILESHARING=
 MOZ_APP_DISPLAYNAME=Mozilla
 MOZ_APP_VERSION=$MOZILLA_VERSION
 MOZ_EXTENSIONS_DEFAULT=" typeaheadfind"
-# MOZ_XUL_APP=1
+MOZ_XUL_APP=
 MOZ_PREF_EXTENSIONS=
 MOZ_WEBSERVICES=
diff --git a/composer/confvars.sh b/composer/confvars.sh
index 6f6e25c2ea7..719bbf4f03b 100755
--- a/composer/confvars.sh
+++ b/composer/confvars.sh
@@ -38,7 +38,6 @@
 
 MOZ_APP_NAME=nvu
 MOZ_APP_DISPLAYNAME=NVU
-MOZ_XUL_APP=1
 MOZ_UPDATER=1
 MOZ_STANDALONE_COMPOSER=1
 MOZ_COMPOSER=1
diff --git a/configure.in b/configure.in
index 196813b0816..654f550a2e6 100644
--- a/configure.in
+++ b/configure.in
@@ -4120,6 +4120,7 @@ MOZ_XPINSTALL=1
 MOZ_XSLT_STANDALONE=
 MOZ_XTF=1
 MOZ_XUL=1
+MOZ_XUL_APP=1
 NS_PRINTING=1
 NECKO_COOKIES=1
 NECKO_DISK_CACHE=1
@@ -4238,7 +4239,6 @@ basic)
   MOZ_XPFE_COMPONENTS=
   MOZ_XPINSTALL=
   MOZ_XTF=
-  MOZ_XUL_APP=1
   NECKO_DISK_CACHE=
   NECKO_PROTOCOLS_DEFAULT="about data http file res"
   NECKO_SMALL_BUFFERS=1
@@ -4290,7 +4290,6 @@ minimal)
   MOZ_XTF=
   MOZ_XUL=
   MOZ_RDF=
-  MOZ_XUL_APP=1
   NECKO_DISK_CACHE=
   NECKO_PROTOCOLS_DEFAULT="about data http file res"
   NECKO_SMALL_BUFFERS=1
diff --git a/extensions/confvars.sh b/extensions/confvars.sh
index 8fbc984cd0b..7261a5fd298 100755
--- a/extensions/confvars.sh
+++ b/extensions/confvars.sh
@@ -39,4 +39,3 @@
 MOZ_APP_NAME=mozilla
 MOZ_APP_DISPLAYNAME=Mozilla
 MOZ_APP_VERSION=$MOZILLA_VERSION
-MOZ_XUL_APP=1
diff --git a/mail/confvars.sh b/mail/confvars.sh
index d8e02ee73cc..de65d3b759a 100755
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -38,7 +38,6 @@
 
 MOZ_APP_NAME=thunderbird
 MOZ_APP_DISPLAYNAME=Thunderbird
-MOZ_XUL_APP=1
 MOZ_UPDATER=1
 MOZ_THUNDERBIRD=1
 MOZ_MATHML=
diff --git a/suite/confvars.sh b/suite/confvars.sh
index cb2ccf87e82..9e3f33756b1 100755
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -38,7 +38,6 @@
 
 MOZ_APP_NAME=seamonkey
 MOZ_APP_DISPLAYNAME=SeaMonkey
-MOZ_XUL_APP=1
 MOZ_MAIL_NEWS=1
 MOZ_LDAP_XPCOM=1
 MOZ_STATIC_MAIL_BUILD=1
diff --git a/xulrunner/confvars.sh b/xulrunner/confvars.sh
index 15adba4513e..7d6a904d409 100755
--- a/xulrunner/confvars.sh
+++ b/xulrunner/confvars.sh
@@ -38,7 +38,6 @@
 
 MOZ_APP_NAME=xulrunner
 MOZ_APP_DISPLAYNAME=XULRunner
-MOZ_XUL_APP=1
 MOZ_UPDATER=1
 MOZ_XULRUNNER=1
 MOZ_ENABLE_LIBXUL=1