diff --git a/pisi/api.py b/pisi/api.py
index b1897e5b..82897f81 100644
--- a/pisi/api.py
+++ b/pisi/api.py
@@ -744,11 +744,9 @@ def calculate_conflicts(*args, **kw):
 def reorder_base_packages(*args, **kw):
     return pisi.operations.helper.reorder_base_packages(*args, **kw)
 
-@locked
 def build_until(*args, **kw):
     return pisi.operations.build.build_until(*args, **kw)
 
-@locked
 def build(*args, **kw):
     return pisi.atomicoperations.build(*args, **kw)
 
diff --git a/pisi/cli/build.py b/pisi/cli/build.py
index ca43e32e..1cc4fed0 100644
--- a/pisi/cli/build.py
+++ b/pisi/cli/build.py
@@ -66,8 +66,6 @@ to be downloaded from a repository containing sources.
                      default=False, help=_("Bypass testing step"))
         group.add_option("--create-static", action="store_true",
                                default=False, help=_("Create a static package with ar files"))
-        group.add_option("--no-install", action="store_true",
-                               default=False, help=_("Do not install build dependencies, fail if a build dependency is present"))
         group.add_option("-F", "--package-format", action="store", default='1.1',
                                help=_("PiSi binary package formats: '1.0', '1.1' (default)"))
         group.add_option("--use-quilt", action="store_true", default=False,