diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 5a935db975..1470e5e069 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -112,15 +112,6 @@ class InstanceMetadata():
 
         ctxt = context.get_admin_context()
 
-        # NOTE(danms): This should be removed after bp:compute-manager-objects
-        if not isinstance(instance, obj_base.NovaObject):
-            expected = ['metadata', 'system_metadata']
-            if 'info_cache' in instance:
-                expected.append('info_cache')
-            instance = objects.Instance._from_db_object(
-                ctxt, objects.Instance(), instance,
-                expected_attrs=expected)
-
         # The default value of mimeType is set to MIME_TYPE_TEXT_PLAIN
         self.set_mimetype(MIME_TYPE_TEXT_PLAIN)
         self.instance = instance
diff --git a/nova/tests/unit/test_metadata.py b/nova/tests/unit/test_metadata.py
index 52e8df49a3..89a64cad8f 100644
--- a/nova/tests/unit/test_metadata.py
+++ b/nova/tests/unit/test_metadata.py
@@ -357,11 +357,6 @@ class OpenStackMetadataTestCase(test.TestCase):
         self.flags(use_local=True, group='conductor')
         fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs)
 
-    def test_with_primitive_instance(self):
-        mdinst = fake_InstanceMetadata(self.stubs, INSTANCE)
-        result = mdinst.lookup('/openstack')
-        self.assertIn('latest', result)
-
     def test_top_level_listing(self):
         # request for /openstack/<version>/ should show metadata.json
         inst = self.instance.obj_clone()