--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -982,16 +982,17 @@ def all_configure_options():
         # separate for ease of understanding and ease of removal)
         elif (option.help == 'Help missing for old configure options' and
                 option in __sandbox__._raw_options):
             result.append(__sandbox__._raw_options[option])
 
     return quote(*result)
 
 set_config('MOZ_CONFIGURE_OPTIONS', all_configure_options)
+non_global('MOZ_CONFIGURE_OPTIONS')
 
 
 # This is temporary until js/src/configure and configure are merged.
 # Use instead of option() in js/moz.configure and more generally, for
 # options that are shared between configure and js/src/configure.
 @template
 def js_option(*args, **kwargs):
     opt = option(*args, **kwargs)