diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py
index eccbb6c81e..3ca44a1e16 100644
--- a/ironic/drivers/modules/agent_client.py
+++ b/ironic/drivers/modules/agent_client.py
@@ -41,10 +41,6 @@ class AgentClient(object):
 
     def _get_command_url(self, node):
         agent_url = node.driver_internal_info.get('agent_url')
-        if not agent_url:
-            # (lintan) Keep backwards compatible with booted nodes before this
-            # change. Remove this after Kilo.
-            agent_url = node.driver_info.get('agent_url')
         if not agent_url:
             raise exception.IronicException(_('Agent driver requires '
                                               'agent_url in '
diff --git a/ironic/tests/unit/drivers/modules/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py
index be81927201..4d71cafea9 100644
--- a/ironic/tests/unit/drivers/modules/test_agent_client.py
+++ b/ironic/tests/unit/drivers/modules/test_agent_client.py
@@ -38,7 +38,6 @@ class MockResponse(object):
 class MockNode(object):
     def __init__(self):
         self.uuid = 'uuid'
-        self.driver_info = {}
         self.driver_internal_info = {
             'agent_url': "http://127.0.0.1:9999",
             'clean_version': {'generic': '1'}
@@ -48,7 +47,6 @@ class MockNode(object):
     def as_dict(self):
         return {
             'uuid': self.uuid,
-            'driver_info': self.driver_info,
             'driver_internal_info': self.driver_internal_info,
             'instance_info': self.instance_info
         }