diff --git a/new/bootstrap.jam b/new/bootstrap.jam
index 1a8b6ac6a..449eea881 100644
--- a/new/bootstrap.jam
+++ b/new/bootstrap.jam
@@ -19,15 +19,7 @@ import modules ;
 # process if they are asking for help.
 #
 import doc ;
-if [ doc.help ]
-{
-    # Do nothing, the doc system will generate the appropriate
-    # targets that prints out the documentation.
-    # To do this we need to fake the build system loading so the
-    # Jambase doesn't error.
-    module build-system { rule __placeholder__ ( ) { } }
-}
-else
+if ! [ doc.help ]
 {
     # No help requested, go ahead and load and build the users
     # project.
diff --git a/new/build-system.jam b/new/build-system.jam
index 51525b9e6..7c7def0cd 100644
--- a/new/build-system.jam
+++ b/new/build-system.jam
@@ -3,14 +3,4 @@
 #  all copies. This software is provided "as is" without express or implied
 #  warranty, and with no claim as to its suitability for any purpose.
 import project ;
-
-# This rule is just here to suppress a warning generated by Jambase
-# when the build system fails to be found. Using the presence of rules
-# in build-system.jam to check for this is probably ill-advised; we
-# should use GLOB instead. When that happens, __dummy can go away.
-rule __dummy
-{
-    EXIT "don't call this rule" ;
-}
-
 project.load "." ;
diff --git a/new/test.jam b/new/test.jam
index 36aea0bd3..216d8f784 100644
--- a/new/test.jam
+++ b/new/test.jam
@@ -1,6 +1,3 @@
-
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import string ;
 import numbers ;
 import sequence ;
diff --git a/test/project-test1.jam b/test/project-test1.jam
index d9aceb3b1..db8566262 100644
--- a/test/project-test1.jam
+++ b/test/project-test1.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/test/project-test1/project-test1.jam b/test/project-test1/project-test1.jam
index 2e62fae49..efead049a 100644
--- a/test/project-test1/project-test1.jam
+++ b/test/project-test1/project-test1.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/test/project-test2/project-test2.jam b/test/project-test2/project-test2.jam
index 04ddc5199..811a4ff75 100644
--- a/test/project-test2/project-test2.jam
+++ b/test/project-test2/project-test2.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/v2/bootstrap.jam b/v2/bootstrap.jam
index 1a8b6ac6a..449eea881 100644
--- a/v2/bootstrap.jam
+++ b/v2/bootstrap.jam
@@ -19,15 +19,7 @@ import modules ;
 # process if they are asking for help.
 #
 import doc ;
-if [ doc.help ]
-{
-    # Do nothing, the doc system will generate the appropriate
-    # targets that prints out the documentation.
-    # To do this we need to fake the build system loading so the
-    # Jambase doesn't error.
-    module build-system { rule __placeholder__ ( ) { } }
-}
-else
+if ! [ doc.help ]
 {
     # No help requested, go ahead and load and build the users
     # project.
diff --git a/v2/test/project-test1.jam b/v2/test/project-test1.jam
index d9aceb3b1..db8566262 100644
--- a/v2/test/project-test1.jam
+++ b/v2/test/project-test1.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/v2/test/project-test1/project-test1.jam b/v2/test/project-test1/project-test1.jam
index 2e62fae49..efead049a 100644
--- a/v2/test/project-test1/project-test1.jam
+++ b/v2/test/project-test1/project-test1.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/v2/test/project-test2/project-test2.jam b/v2/test/project-test2/project-test2.jam
index 04ddc5199..811a4ff75 100644
--- a/v2/test/project-test2/project-test2.jam
+++ b/v2/test/project-test2/project-test2.jam
@@ -1,5 +1,3 @@
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import project ;
 import targets ;
 import assert ;
diff --git a/v2/test/test.jam b/v2/test/test.jam
index 36aea0bd3..216d8f784 100644
--- a/v2/test/test.jam
+++ b/v2/test/test.jam
@@ -1,6 +1,3 @@
-
-module build-system { rule __dummy { } } # Keep the bogus assertion in Jambase happy
-
 import string ;
 import numbers ;
 import sequence ;