diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index 533845511..23962a258 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -1217,12 +1217,11 @@ class basic-target : abstract-target
             } 
             else
             {
+                # We're here either because there's error computing
+                # properties, or there's <build>no in properties.
+                # In the latter case we don't want any diagnostic.
+                # In the former case, we need diagnostics. FIXME.
                 self.generated.$(property-set) = $(rproperties) ;
-                
-                if $(rproperties[1]) != "@error"
-                {
-                    ECHO "Skipping build of" [ full-name ] "-- <build>no in properties." ;
-                }
             }       
         }                
         else
diff --git a/v2/test/build_no.py b/v2/test/build_no.py
index f10daeaed..ce5c51e46 100644
--- a/v2/test/build_no.py
+++ b/v2/test/build_no.py
@@ -28,8 +28,6 @@ int main()
 t.run_build_system()
 t.expect_nothing_more()
 
-t.fail_test(string.find(t.stdout(), "Skipping build of ./hello -- <build>no in properties.") == -1)
-
 t.run_build_system("release")
 t.expect_addition("bin/$toolset/release/hello.exe")