diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 4440d3a25..1eb72090f 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -531,12 +531,18 @@ class _Client(node.Node, pollmixin.PollMixin):
 
         from allmydata.node import create_tub, create_tub_options
 
+        # this is temporary; create_client() should create a
+        # storage-broker and pass it in -- that method already has
+        # all these objects created...
+        default_connection_handlers, foolscap_connection_handlers = create_connection_handlers(reactor, self.basedir, self.config, self._i2p_provider, self._tor_provider)
+
+
         def tub_creator(handler_overrides={}, **kwargs):
             tub_options = create_tub_options(self.config)
             return create_tub(
                 tub_options,
-                self._default_connection_handlers,
-                self._foolscap_connection_handlers,
+                default_connection_handlers,
+                foolscap_connection_handlers,
                 handler_overrides=handler_overrides,
                 **kwargs
             )
diff --git a/src/allmydata/node.py b/src/allmydata/node.py
index b7e65b6bc..051683e71 100644
--- a/src/allmydata/node.py
+++ b/src/allmydata/node.py
@@ -698,6 +698,10 @@ class Node(service.MultiService):
         self.get_config = config.get_config # XXX stopgap
         self.nickname = config.nickname # XXX stopgap
 
+        # this can go away once Client.init_client_storage_broker is moved into create_client()
+        self._i2p_provider = i2p_provider
+        self._tor_provider = tor_provider
+
         self.init_tempdir()
 
         self.create_log_tub()