--- a/src/modules/client/api.py	Fri Oct 01 14:39:44 2010 -0700
+++ b/src/modules/client/api.py	Fri Oct 01 16:35:07 2010 -0700
@@ -3024,9 +3024,8 @@
 def image_create(pkg_client_name, version_id, root, imgtype, is_zone,
     cancel_state_callable=None, facets=misc.EmptyDict, force=False,
     mirrors=misc.EmptyI, origins=misc.EmptyI, prefix=None, refresh_allowed=True,
-    repo_uri=None, socket_path=None, ssl_cert=None, ssl_key=None,
-    sys_repo=None, user_provided_dir=False, progtrack=None,
-    variants=misc.EmptyDict, props=misc.EmptyDict):
+    repo_uri=None, ssl_cert=None, ssl_key=None, user_provided_dir=False,
+    progtrack=None, variants=misc.EmptyDict, props=misc.EmptyDict):
         """Creates an image at the specified location.
 
         'pkg_client_name' is a string containing the name of the client,
@@ -3114,7 +3113,7 @@
         # Caller must provide a prefix and repository, or no prefix and a
         # repository, or a prefix and origins.
         assert (prefix and repo_uri) or (not prefix and repo_uri) or (prefix and
-            origins) or (prefix and sys_repo and socket_path)
+            origins)
 
         # If prefix isn't provided, and refresh isn't allowed, then auto-config
         # cannot be done.
@@ -3199,9 +3198,6 @@
                                 repo.add_origin(o)
                         for m in mirrors:
                                 repo.add_mirror(m)
-                        if sys_repo and socket_path:
-                                repo.set_system_repo(sys_repo,
-                                    socket_path=socket_path)
                         pub = publisher.Publisher(prefix,
                             repositories=[repo])
                         pubs = [pub]