--- a/calendar/lightning/Makefile.in
+++ b/calendar/lightning/Makefile.in
@@ -43,17 +43,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= lightning
 
 export XPI_NAME = lightning
 export USE_EXTENSION_MANIFEST = 1
-export NO_JAR_AUTO_REG = 1
 XPI_PKGNAME = lightning
 
 STRIP_XPI = 1
 DIST_FILES = install.rdf
 PREF_JS_EXPORTS = $(srcdir)/content/lightning.js
 LIGHTNING_VERSION := $(shell cat $(srcdir)/../sunbird/config/version.txt)
 ifdef MOZILLA_1_9_1_BRANCH
 THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version-191.txt)
@@ -114,16 +113,16 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUND
            -DTARGET_PLATFORM=$(OS_TARGET)_$(TARGET_XPCOM_ABI) \
            -DTHEME=$(THEME) \
            $(NULL)
 
 GRE_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build BuildID)
 DEFINES += -DGRE_BUILDID=$(GRE_BUILDID)
 
 libs-%:
-	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=lightning USE_EXTENSION_MANIFEST=1 NO_JAR_AUTO_REG=1
-	$(MAKE) -C ../locales libs AB_CD=$* XPI_NAME=lightning USE_EXTENSION_MANIFEST=1 NO_JAR_AUTO_REG=1
+	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=lightning USE_EXTENSION_MANIFEST=1
+	$(MAKE) -C ../locales libs AB_CD=$* XPI_NAME=lightning USE_EXTENSION_MANIFEST=1
 
 # xxx todo: unless our packaging story is revised (bug 406579) we package up timezones.sqlite
 libs::
 	$(NSINSTALL) $(srcdir)/../timezones/timezones.sqlite $(FINAL_TARGET)
 
 include $(topsrcdir)/config/rules.mk

--- a/calendar/timezones/Makefile.in
+++ b/calendar/timezones/Makefile.in
@@ -100,11 +100,11 @@ libs::
 	$(DIST)/bin/xpcshell -s -w $(srcdir)/update.js $(update) $(srcdir)/$(DEPTH) $(TIMEZONES_VERSION)
 	echo 'SELECT * FROM tz_data ORDER BY tzid;' | sqlite3 $(TIMEZONES_SQLITE) > $(srcdir)/timezones.dump
 endif
 
 libs::
 	$(NSINSTALL) $(TIMEZONES_SQLITE) $(FINAL_TARGET)
 
 libs-%:
-	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1 NO_JAR_AUTO_REG=1
+	$(MAKE) -C locales libs AB_CD=$* XPI_NAME=calendar-timezones USE_EXTENSION_MANIFEST=1
 
 include $(topsrcdir)/config/rules.mk

--- a/mailnews/extensions/palmsync/Makefile.in
+++ b/mailnews/extensions/palmsync/Makefile.in
@@ -40,17 +40,16 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE			= palmsync
 XPI_NAME		= palmsync
 USE_EXTENSION_MANIFEST	= 1
-NO_JAR_AUTO_REG		= 1
 # make this id as short as possible due to a bug with the palm deskop and long path names.
 # Change installer/Makefile.in and nsPalmSyncSupport.cpp if this changes.
 INSTALL_EXTENSION_ID	= p@m
 XPI_PKGNAME		= palmsync-$(MOZ_APP_VERSION)
 DIST_FILES 		= install.rdf
 
 DIRS	= build public src installer
 

--- a/mailnews/extensions/palmsync/installer/Makefile.in
+++ b/mailnews/extensions/palmsync/installer/Makefile.in
@@ -41,17 +41,16 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 PALM_CDK_INC	= $(PALM_CDK_DIR)/C++/Include
 
 include $(DEPTH)/config/autoconf.mk
 
 XPI_NAME               = palmsync
 USE_EXTENSION_MANIFEST = 1
-NO_JAR_AUTO_REG        = 1
 # make this id as short as possible due to a bug with the palm deskop and long path names.
 # Change /mailnews/extensions/palmsync/Makefile.in and nsPalmSyncSupport.cpp if this changes.
 INSTALL_EXTENSION_ID   = p@m
 XPI_PKGNAME            = palmsync-$(MOZ_APP_VERSION)
 
 PROGRAM		= PalmSyncInstall$(BIN_SUFFIX)
 RESFILE		= PalmSyncInstall.res
 USE_STATIC_LIBS = 1

--- a/suite/debugQA/Makefile.in
+++ b/suite/debugQA/Makefile.in
@@ -42,17 +42,16 @@ topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE                 = debugQA
 XPI_NAME               = debugQA
 USE_EXTENSION_MANIFEST = 1
-NO_JAR_AUTO_REG        = 1
 INSTALL_EXTENSION_ID   = debugQA@mozilla.org
 XPI_PKGNAME            = debugQA-$(MOZ_APP_VERSION)
 
 DIST_FILES = install.rdf
 
 DIRS = locales
 
 XULAPP_DEFINES = \

--- a/suite/debugQA/locales/Makefile.in
+++ b/suite/debugQA/locales/Makefile.in
@@ -40,17 +40,16 @@
 DEPTH=../../..
 topsrcdir=@top_srcdir@
 srcdir=@srcdir@
 VPATH=@srcdir@
 relativesrcdir=suite/debugQA/locales
 
 XPI_NAME               = debugQA
 USE_EXTENSION_MANIFEST = 1
-NO_JAR_AUTO_REG        = 1
 
 # include config.mk before we override the AB_CD var it sets
 include $(topsrcdir)/config/config.mk
 
 # override UI locale with en-US so that we don't need to provide L10n for this
 AB_CD = en-US
 DEFINES += -DAB_CD=$(AB_CD)