diff --git a/awx/api/views/inventory.py b/awx/api/views/inventory.py
index 8fb7b3f419..f18bc29fe2 100644
--- a/awx/api/views/inventory.py
+++ b/awx/api/views/inventory.py
@@ -98,12 +98,10 @@ class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIVie
 
 
 class ConstructedInventoryDetail(InventoryDetail):
-
     serializer_class = ConstructedInventorySerializer
 
 
 class ConstructedInventoryList(InventoryList):
-
     serializer_class = ConstructedInventorySerializer
 
     def get_queryset(self):
diff --git a/awx/main/migrations/0175_constructed_inventory.py b/awx/main/migrations/0175_constructed_inventory.py
index 37085186d4..5682d9c3c7 100644
--- a/awx/main/migrations/0175_constructed_inventory.py
+++ b/awx/main/migrations/0175_constructed_inventory.py
@@ -4,7 +4,6 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         ('main', '0174_ensure_org_ee_admin_roles'),
     ]
diff --git a/awx/main/tasks/jobs.py b/awx/main/tasks/jobs.py
index 46cf97989c..6743105512 100644
--- a/awx/main/tasks/jobs.py
+++ b/awx/main/tasks/jobs.py
@@ -320,7 +320,7 @@ class BaseTask(object):
         for hostname, hv in script_data.get('_meta', {}).get('hostvars', {}).items():
             # maintain a list of host_name --> host_id
             # so we can associate emitted events to Host objects
-            self.runner_callback.host_map[hostname] = hv.pop('remote_tower_id', '')
+            self.runner_callback.host_map[hostname] = hv.get('remote_tower_id', '')
         file_content = '#! /usr/bin/env python3\n# -*- coding: utf-8 -*-\nprint(%r)\n' % json.dumps(script_data)
         return self.write_private_data_file(private_data_dir, file_name, file_content, sub_dir='inventory', file_permissions=0o700)
 
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 41feba7d8c..2d6e044f30 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -747,6 +747,8 @@ SCM_EXCLUDE_EMPTY_GROUPS = False
 # ----------------
 # -- Constructed --
 # ----------------
+CONSTRUCTED_INSTANCE_ID_VAR = 'remote_tower_id'
+
 CONSTRUCTED_EXCLUDE_EMPTY_GROUPS = False
 
 # ---------------------