diff --git a/ansible_mitogen/connection.py b/ansible_mitogen/connection.py
index 500837d3..ccaba7dc 100644
--- a/ansible_mitogen/connection.py
+++ b/ansible_mitogen/connection.py
@@ -828,7 +828,6 @@ class Connection(ansible.plugins.connection.ConnectionBase):
         process to establish the real connection on our behalf, or return a
         reference to the existing one.
         """
-        import epdb; epdb.set_trace()
         if self.connected:
             return
 
diff --git a/ansible_mitogen/loaders.py b/ansible_mitogen/loaders.py
index 9ce6b1fa..00a89b74 100644
--- a/ansible_mitogen/loaders.py
+++ b/ansible_mitogen/loaders.py
@@ -59,4 +59,4 @@ except ImportError:  # Ansible <2.4
 
 # These are original, unwrapped implementations
 action_loader__get = action_loader.get
-connection_loader__get = connection_loader.get
+connection_loader__get = connection_loader.get_with_context
diff --git a/ansible_mitogen/strategy.py b/ansible_mitogen/strategy.py
index b1f744d5..c0ba6014 100644
--- a/ansible_mitogen/strategy.py
+++ b/ansible_mitogen/strategy.py
@@ -166,7 +166,6 @@ def wrap_connection_loader__get(name, *args, **kwargs):
     for some transports into requests for a compatible Mitogen transport.
     """
     # THIS ISN'T BEING CALLED NOW
-    import epdb; epdb.set_trace()
     if name in REDIRECTED_CONNECTION_PLUGINS:
         name = 'mitogen_' + name
 
@@ -221,7 +220,7 @@ class AnsibleWrappers(object):
         with references to the real functions.
         """
         ansible_mitogen.loaders.action_loader.get = wrap_action_loader__get
-        ansible_mitogen.loaders.connection_loader.get = wrap_connection_loader__get
+        ansible_mitogen.loaders.connection_loader.get_with_context = wrap_connection_loader__get
 
         global worker__run
         worker__run = ansible.executor.process.worker.WorkerProcess.run
@@ -368,7 +367,6 @@ class StrategyMixin(object):
                     # TODO: ansible 2.10 doesn't actually call Mitogen like it used to
                     # mitogen_linear is called as expected but connection wrapping doesn't work
                     run = super(StrategyMixin, self).run
-                    import epdb; epdb.set_trace()
                     return mitogen.core._profile_hook('Strategy',
                         lambda: run(iterator, play_context)
                     )