diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
index 0265e09c59d..dfe9f3ffec6 100644
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -362,11 +362,6 @@ LIBS_DESC_SUFFIX = @LIBS_DESC_SUFFIX@
 USE_N32		= @USE_N32@
 HAVE_64BIT_OS	= @HAVE_64BIT_OS@
 
-# Temp hack.  It is not my intention to leave this crap in here for ever.
-# Im talking to fur right now to solve the problem without introducing
-# NS_USE_NATIVE to the build system -ramiro.
-NS_USE_NATIVE = @NS_USE_NATIVE@
-
 CC		    = @CC@
 CXX		    = @CXX@
 
diff --git a/configure.in b/configure.in
index 6ce53031b21..c1b3a54d19f 100644
--- a/configure.in
+++ b/configure.in
@@ -2488,7 +2488,6 @@ ia64*-hpux*)
     if test "$SOLARIS_SUNPRO_CC"; then
        LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
        LIBS="-lCrun -lCstd -lc $LIBS"
-       NS_USE_NATIVE=1
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
        CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
        CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions -norunpath -D__FUNCTION__=__func__ -template=no%extdef"
@@ -8209,7 +8208,6 @@ AC_SUBST(WINDRES)
 AC_SUBST(IMPLIB)
 AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
-AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_WIDGET_TOOLKIT)
 AC_SUBST(MOZ_UPDATE_XTERM)
 AC_SUBST(MOZ_PLATFORM_MAEMO)
diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in
index a3c7fbe3193..8d8b4a54201 100644
--- a/js/src/config/autoconf.mk.in
+++ b/js/src/config/autoconf.mk.in
@@ -191,11 +191,6 @@ LIBS_DESC_SUFFIX = @LIBS_DESC_SUFFIX@
 USE_N32		= @USE_N32@
 HAVE_64BIT_OS	= @HAVE_64BIT_OS@
 
-# Temp hack.  It is not my intention to leave this crap in here for ever.
-# Im talking to fur right now to solve the problem without introducing
-# NS_USE_NATIVE to the build system -ramiro.
-NS_USE_NATIVE = @NS_USE_NATIVE@
-
 CC		    = @CC@
 CXX		    = @CXX@
 
diff --git a/js/src/configure.in b/js/src/configure.in
index ba3b72a567b..0bf21eabccf 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -2334,7 +2334,6 @@ ia64*-hpux*)
     if test "$SOLARIS_SUNPRO_CC"; then
        LDFLAGS="$LDFLAGS -z ignore -R '\$\$ORIGIN:\$\$ORIGIN/..' -z lazyload -z combreloc -z muldefs"
        LIBS="-lCrun -lCstd -lc $LIBS"
-       NS_USE_NATIVE=1
        AC_DEFINE(NSCAP_DISABLE_DEBUG_PTR_TYPES)
        CFLAGS="$CFLAGS -xlibmieee -xstrconst -xbuiltin=%all -D__FUNCTION__=__func__"
        CXXFLAGS="$CXXFLAGS -xlibmieee -xbuiltin=%all -features=tmplife,tmplrefstatic,extensions -norunpath -D__FUNCTION__=__func__ -template=no%extdef"
@@ -5079,7 +5078,6 @@ AC_SUBST(WINDRES)
 AC_SUBST(IMPLIB)
 AC_SUBST(FILTER)
 AC_SUBST(BIN_FLAGS)
-AC_SUBST(NS_USE_NATIVE)
 AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(MOZ_DEBUG)
diff --git a/security/manager/Makefile.in b/security/manager/Makefile.in
index 9efe0c8a655..1c16ad7b23f 100644
--- a/security/manager/Makefile.in
+++ b/security/manager/Makefile.in
@@ -191,9 +191,9 @@ ifndef MOZ_DEBUG
 DEFAULT_GMAKE_FLAGS += BUILD_OPT=1 OPT_CODE_SIZE=1
 endif
 ifdef GNU_CC
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC=1 NS_USE_NATIVE=
+DEFAULT_GMAKE_FLAGS += NS_USE_GCC=1
 else
-DEFAULT_GMAKE_FLAGS += NS_USE_GCC= NS_USE_NATIVE=1
+DEFAULT_GMAKE_FLAGS += NS_USE_GCC=
 endif
 ifdef USE_N32
 # It is not really necessary to specify USE_PTHREADS=1.  USE_PTHREADS