diff --git a/shade/meta.py b/shade/meta.py
index 9d2425f3c..2b162616e 100644
--- a/shade/meta.py
+++ b/shade/meta.py
@@ -66,10 +66,6 @@ def get_server_private_ip(server):
     return get_server_ip(server, ext_tag='fixed', key_name='private')
 
 
-def get_server_public_ip(server):
-    return get_server_ip(server, ext_tag='floating', key_name='public')
-
-
 def get_server_external_ipv4(cloud, server):
     """Find an externally routable IP for the server.
 
diff --git a/shade/tests/unit/test_meta.py b/shade/tests/unit/test_meta.py
index 13915b784..87b5eeaca 100644
--- a/shade/tests/unit/test_meta.py
+++ b/shade/tests/unit/test_meta.py
@@ -104,9 +104,12 @@ class TestMeta(testtools.TestCase):
             addrs, key_name='public', ext_tag='fixed', version=6))
 
     def test_get_server_ip(self):
-        srv = FakeServer()
+        srv = meta.obj_to_dict(FakeServer())
         self.assertEqual(PRIVATE_V4, meta.get_server_private_ip(srv))
-        self.assertEqual(PUBLIC_V4, meta.get_server_public_ip(srv))
+        self.assertEqual(PUBLIC_V4,
+                         meta.get_server_external_ipv4(shade.openstack_cloud(),
+                                                       srv)
+                         )
 
     @mock.patch.object(shade.OpenStackCloud, 'has_service')
     @mock.patch.object(shade.OpenStackCloud, 'search_ports')