--- a/taskcluster/ci/legacy/tasks/post-builds/upload_symbols.yml
+++ b/taskcluster/ci/legacy/tasks/post-builds/upload_symbols.yml
@@ -26,18 +26,9 @@ task:
 
     maxRunTime: 600
 
     command: ["/bin/bash", "bin/upload.sh"]
 
     env:
       GECKO_HEAD_REPOSITORY: '{{head_repository}}'
       GECKO_HEAD_REV: '{{head_rev}}'
-      ARTIFACT_TASKID: '{{build_slugid}}'
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      groupSymbol: tc
-      groupName: Submitted by taskcluster
-      symbol: us
+      ARTIFACT_TASKID: {"task-reference": "<{{build_slugid}}>"}

--- a/taskcluster/taskgraph/task/legacy.py
+++ b/taskcluster/taskgraph/task/legacy.py
@@ -98,32 +98,34 @@ def configure_dependent_task(task_path, 
     task = templates.load(task_path, parameters)
     task['taskId'] = taskid
 
     if 'requires' not in task:
         task['requires'] = []
 
     task['requires'].append(parameters['build_slugid'])
 
-    if 'treeherder' not in task['task']['extra']:
-        task['task']['extra']['treeherder'] = {}
+    if 'extra' not in task['task']:
+        task['task']['extra'] = {}
 
-    # Copy over any treeherder configuration from the build so
-    # tests show up under the same platform...
-    treeherder_config = task['task']['extra']['treeherder']
+    # only set up treeherder information if the task contained any to begin with
+    if 'treeherder' in task['task']['extra']:
+        # Copy over any treeherder configuration from the build so
+        # tests show up under the same platform...
+        treeherder_config = task['task']['extra']['treeherder']
 
-    treeherder_config['collection'] = \
-        build_treeherder_config.get('collection', {})
+        treeherder_config['collection'] = \
+            build_treeherder_config.get('collection', {})
 
-    treeherder_config['build'] = \
-        build_treeherder_config.get('build', {})
+        treeherder_config['build'] = \
+            build_treeherder_config.get('build', {})
 
-    if 'machine' not in treeherder_config:
-        treeherder_config['machine'] = \
-            build_treeherder_config.get('machine', {})
+        if 'machine' not in treeherder_config:
+            treeherder_config['machine'] = \
+                build_treeherder_config.get('machine', {})
 
     if 'routes' not in task['task']:
         task['task']['routes'] = []
 
     if 'scopes' not in task['task']:
         task['task']['scopes'] = []
 
     return task