diff --git a/nova/tests/unit/test_utils.py b/nova/tests/unit/test_utils.py
index b0d17065069c..112b93987c2a 100644
--- a/nova/tests/unit/test_utils.py
+++ b/nova/tests/unit/test_utils.py
@@ -21,7 +21,6 @@ import tempfile
 import eventlet
 import fixtures
 from keystoneauth1 import adapter as ks_adapter
-from keystoneauth1 import exceptions as ks_exc
 from keystoneauth1.identity import base as ks_identity
 from keystoneauth1 import session as ks_session
 import mock
@@ -1055,21 +1054,6 @@ class GetEndpointTestCase(test.NoDBTestCase):
         self.adap.get_endpoint_data.assert_not_called()
         self.adap.get_endpoint.assert_called_once_with()
 
-    def test_nonimage_try_interfaces(self):
-        self.adap.get_endpoint.side_effect = (ks_exc.EndpointNotFound, 'url')
-        self.assertEqual('url', utils.get_endpoint(self.adap))
-        self.adap.get_endpoint_data.assert_not_called()
-        self.assertEqual(2, self.adap.get_endpoint.call_count)
-        self.assertEqual('admin', self.adap.interface)
-
-    def test_nonimage_try_interfaces_fail(self):
-        self.adap.get_endpoint.side_effect = ks_exc.EndpointNotFound
-        self.assertRaises(ks_exc.EndpointNotFound,
-                          utils.get_endpoint, self.adap)
-        self.adap.get_endpoint_data.assert_not_called()
-        self.assertEqual(3, self.adap.get_endpoint.call_count)
-        self.assertEqual('public', self.adap.interface)
-
 
 class RunOnceTests(test.NoDBTestCase):
 
diff --git a/nova/utils.py b/nova/utils.py
index 12df2549f20d..5164607615a8 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -30,7 +30,6 @@ import shutil
 import tempfile
 
 import eventlet
-from keystoneauth1 import exceptions as ks_exc
 from keystoneauth1 import loading as ks_loading
 import netaddr
 from openstack import connection
@@ -1066,30 +1065,7 @@ def get_endpoint(ksa_adapter):
             # ksa_adapter.auth is a _ContextAuthPlugin, which doesn't have
             # get_endpoint_data.  Fall through to using get_endpoint().
             pass
-    # TODO(efried): The remainder of this method reduces to
-    # TODO(efried):     return ksa_adapter.get_endpoint()
-    # TODO(efried): once bug #1709118 is fixed.
-    # NOTE(efried): Id9bd19cca68206fc64d23b0eaa95aa3e5b01b676 may also do the
-    #               trick, once it's in a ksa release.
-    # The EndpointNotFound exception happens when _ContextAuthPlugin is in play
-    # because its get_endpoint() method isn't yet set up to handle interface as
-    # a list.  (It could also happen with a real auth if the endpoint isn't
-    # there; but that's covered below.)
-    try:
-        return ksa_adapter.get_endpoint()
-    except ks_exc.EndpointNotFound:
-        pass
-
-    interfaces = list(ksa_adapter.interface)
-    for interface in interfaces:
-        ksa_adapter.interface = interface
-        try:
-            return ksa_adapter.get_endpoint()
-        except ks_exc.EndpointNotFound:
-            pass
-    raise ks_exc.EndpointNotFound(
-        "Could not find requested endpoint for any of the following "
-        "interfaces: %s" % interfaces)
+    return ksa_adapter.get_endpoint()
 
 
 def generate_hostid(host, project_id):