diff --git a/awx/api/views.py b/awx/api/views.py
index 9b1b4e0cd5..767524355b 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -16,6 +16,7 @@ from collections import OrderedDict
 # Django
 from django.conf import settings
 from django.contrib.auth.models import User
+from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.core.exceptions import FieldError
 from django.db.models import Q, Count
@@ -165,11 +166,12 @@ class ApiV1PingView(APIView):
         Everything returned here should be considered public / insecure, as
         this requires no auth and is intended for use by the installer process.
         """
-        # Most of this response is canned; just build the dictionary.
+        active_tasks = cache.get("active_celery_tasks", None)
         response = {
             'ha': is_ha_environment(),
             'version': get_awx_version(),
             'active_node': settings.CLUSTER_HOST_ID,
+            'celery_active_tasks': json.loads(active_tasks) if active_tasks is not None else None
         }
 
         response['instances'] = []
diff --git a/awx/main/scheduler/__init__.py b/awx/main/scheduler/__init__.py
index c0a680c7d4..dd2c4de705 100644
--- a/awx/main/scheduler/__init__.py
+++ b/awx/main/scheduler/__init__.py
@@ -154,7 +154,7 @@ class TaskManager():
             if not hasattr(settings, 'CELERY_UNIT_TEST'):
                 return None
 
-        return active_tasks
+        return (active_task_queues, active_tasks)
 
     def start_task(self, task, dependent_tasks=[]):
         from awx.main.tasks import handle_work_error, handle_work_success
@@ -326,8 +326,6 @@ class TaskManager():
     def _schedule(self):
         all_sorted_tasks = self.get_tasks()
         if len(all_sorted_tasks) > 0:
-            #self.process_celery_tasks(active_tasks, all_sorted_tasks)
-
             latest_project_updates = self.get_latest_project_update_tasks(all_sorted_tasks)
             self.process_latest_project_updates(latest_project_updates)
 
diff --git a/awx/main/scheduler/tasks.py b/awx/main/scheduler/tasks.py
index 622876a44e..61e5eecc46 100644
--- a/awx/main/scheduler/tasks.py
+++ b/awx/main/scheduler/tasks.py
@@ -1,6 +1,7 @@
 
 # Python
 import logging
+import json
 
 # Django
 from django.db import transaction
@@ -12,6 +13,7 @@ from celery import task
 # AWX
 from awx.main.models import Instance
 from awx.main.scheduler import TaskManager 
+from django.core.cache import cache
 
 logger = logging.getLogger('awx.main.scheduler')
 
@@ -38,8 +40,8 @@ def run_fail_inconsistent_running_jobs():
         try:
             Instance.objects.select_for_update(nowait=True).all()[0]
             scheduler = TaskManager()
-            active_tasks = scheduler.get_active_tasks()
-
+            active_task_queues, active_tasks = scheduler.get_active_tasks()
+            cache.set("active_celery_tasks", json.dumps(active_task_queues))
             if active_tasks is None:
                 # TODO: Failed to contact celery. We should surface this.
                 return None