diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py
index b3dfb1d..1c1a730 100644
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -850,12 +850,6 @@ class ComputeTaskManager(base.Base):
                                      admin_password, injected_files,
                                      requested_networks, block_device_mapping):
         legacy_spec = request_spec.to_legacy_request_spec_dict()
-
-        # XXXX - IS THIS RIGHT?
-        legacy_spec['instance_properties']['uuid'] = \
-            build_requests[0].instance_uuid
-        # XXXX -------------------------
-
         try:
             hosts = self._schedule_instances(context, legacy_spec,
                     filter_properties)
diff --git a/nova/tests/unit/conductor/test_conductor.py b/nova/tests/unit/conductor/test_conductor.py
index 366e68b..88b6eac 100644
--- a/nova/tests/unit/conductor/test_conductor.py
+++ b/nova/tests/unit/conductor/test_conductor.py
@@ -1462,7 +1462,8 @@ class ConductorTaskTestCase(_BaseTaskTestCase, test_compute.BaseTestCase):
             self.ctxt, instance_uuid=build_request.instance.uuid,
             cell_mapping=None, project_id=self.ctxt.project_id)
         im.create()
-        params['request_spec'] = objects.RequestSpec()
+        params['request_spec'] = objects.RequestSpec(
+            instance_uuid=build_request.instance_uuid)
         params['image'] = {'fake_data': 'should_pass_silently'}
         params['filter_properties'] = {'limits': {},
                                      'retry': {'num_attempts': 1,