diff --git a/src/tools/bzip2.jam b/src/tools/bzip2.jam
index 0a525905c..ae9a03909 100644
--- a/src/tools/bzip2.jam
+++ b/src/tools/bzip2.jam
@@ -137,13 +137,11 @@ rule init (
                 [ property.select <search> <include> <name> : $(options) ] "and"
                 [ property.select <source> <tag> <build-name> : $(options) ] ;
         }
-        else
-        {
-            no-build-from-source = true ;
-        }
     }
-
-    source-path ?= [ modules.peek : BZIP2_SOURCE ] ;
+    else
+    {
+        source-path ?= [ modules.peek : BZIP2_SOURCE ] ;
+    }
 
     if $(.configured.$(condition))
     {
@@ -160,7 +158,7 @@ rule init (
         }
         return ;
     }
-    else if $(source-path) && ! $(no-build-from-source)
+    else if $(source-path)
     {
         build-name ?= bz2 ;
         library-id = [ CALC $(library-id) + 1 ] ;
@@ -218,7 +216,9 @@ rule init (
             $(mt).set-target $(target) ;
         }
         targets.main-target-alternative $(mt) ;
-    } else {
+    }
+    else
+    {
         if $(.debug)
         {
             ECHO "notice: [bzip2] Using pre-installed library" ;
@@ -229,7 +229,7 @@ rule init (
         }
 
         local mt = [ new ac-library bzip2 : $(.project) : $(condition) :
-            $(include-path) : $(library-path) : $(library-name) : $(root) ] ;
+            $(include-path) : $(library-path) : $(library-name) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
         targets.main-target-alternative $(mt) ;
diff --git a/src/tools/zlib.jam b/src/tools/zlib.jam
index 8095eeeee..5a7d5fbdf 100644
--- a/src/tools/zlib.jam
+++ b/src/tools/zlib.jam
@@ -135,13 +135,11 @@ rule init (
                 [ property.select <search> <include> <name> : $(options) ] "and"
                 [ property.select <source> <tag> <build-name> : $(options) ] ;
         }
-        else
-        {
-            no-build-from-source = true ;
-        }
     }
-
-    source-path ?= [ modules.peek : ZLIB_SOURCE ] ;
+    else
+    {
+        source-path ?= [ modules.peek : ZLIB_SOURCE ] ;
+    }
 
     if $(.configured.$(condition))
     {
@@ -158,7 +156,7 @@ rule init (
         }
         return ;
     }
-    else if $(source-path) && ! $(no-build-from-source)
+    else if $(source-path)
     {
         build-name ?= z ;
         library-id = [ CALC $(library-id) + 1 ] ;
@@ -185,7 +183,8 @@ rule init (
             }
         }
         local target ;
-        if $(sources) {
+        if $(sources)
+        {
             target = [ targets.create-typed-target LIB : $(.project)
               : $(build-name).$(library-id)
               : $(sources)
@@ -207,7 +206,9 @@ rule init (
             $(mt).set-target $(target) ;
         }
         targets.main-target-alternative $(mt) ;
-    } else {
+    }
+    else
+    {
         if $(.debug)
         {
             ECHO "notice: [zlib] Using pre-installed library" ;
@@ -218,7 +219,7 @@ rule init (
         }
 
         local mt = [ new ac-library zlib : $(.project) : $(condition) :
-            $(include-path) : $(library-path) : $(library-name) : $(root) ] ;
+            $(include-path) : $(library-path) : $(library-name) ] ;
         $(mt).set-header $(header) ;
         $(mt).set-default-names $(names) ;
         targets.main-target-alternative $(mt) ;