diff --git a/allyourbase.jam b/allyourbase.jam
index fcac135bd..aecacd917 100644
--- a/allyourbase.jam
+++ b/allyourbase.jam
@@ -482,12 +482,12 @@ rule set-as-singleton ( variables + )
     for local variable in $(variables)
     {
         $(variable) = $($(variable):J=" ") ;
-        if ! $(gSINGLETON_SET($(variable)))
-        {
-            gSINGLETON($(variable)) = $($(variable)) ;
-            gSINGLETON_SET($(variable)) = true ;
-        }
-        $(variable) ?= $(gSINGLETON($(variable))) ;
+        #~ if ! $(gSINGLETON_SET($(variable)))
+        #~ {
+            #~ gSINGLETON($(variable)) = $($(variable)) ;
+            #~ gSINGLETON_SET($(variable)) = true ;
+        #~ }
+        #~ $(variable) ?= $(gSINGLETON($(variable))) ;
     }
 }
 
diff --git a/v1/allyourbase.jam b/v1/allyourbase.jam
index fcac135bd..aecacd917 100644
--- a/v1/allyourbase.jam
+++ b/v1/allyourbase.jam
@@ -482,12 +482,12 @@ rule set-as-singleton ( variables + )
     for local variable in $(variables)
     {
         $(variable) = $($(variable):J=" ") ;
-        if ! $(gSINGLETON_SET($(variable)))
-        {
-            gSINGLETON($(variable)) = $($(variable)) ;
-            gSINGLETON_SET($(variable)) = true ;
-        }
-        $(variable) ?= $(gSINGLETON($(variable))) ;
+        #~ if ! $(gSINGLETON_SET($(variable)))
+        #~ {
+            #~ gSINGLETON($(variable)) = $($(variable)) ;
+            #~ gSINGLETON_SET($(variable)) = true ;
+        #~ }
+        #~ $(variable) ?= $(gSINGLETON($(variable))) ;
     }
 }