--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -3274,28 +3274,16 @@ delete_slave_platform(BRANCHES, PLATFORM
 # Explicitly don't remove win7-ix from talos
 for branch in set(BRANCHES.keys()) - set(win7_vm_inactive_branches):
     for platform in ('win32', 'win64'):
         if platform not in BRANCHES[branch]['platforms']:
             continue
         if nested_haskey(BRANCHES[branch]['platforms'], platform, 'win7-ix'):
             del BRANCHES[branch]['platforms'][platform]['win7-ix']
 
-# Bug 1253341 - run talos jobs on AWS
-for branch in ('try',):
-    BRANCHES[branch]['platforms']['linux64']['talos_slave_platforms'] = ['ubuntu64_hw', 'ubuntu64_vm']
-    # Add ubuntu64_vm to the talos suites
-    for test, test_config in BRANCHES[branch].items():
-        if not test.endswith('_tests'):
-            continue
-        tests, merge, extra, platforms = test_config
-        if 'ubuntu64_hw' in platforms and 'ubuntu64_vm' not in platforms:
-            platforms = platforms + ['ubuntu64_vm']
-            BRANCHES[branch][test] = (tests, merge, extra, platforms)
-
 if __name__ == "__main__":
     import sys
     import pprint
 
     args = sys.argv[1:]
 
     if len(args) > 0:
         items = dict([(b, BRANCHES[b]) for b in args])

--- a/mozilla-tests/tests_master.cfg
+++ b/mozilla-tests/tests_master.cfg
@@ -68,24 +68,20 @@ from buildbot.buildslave import BuildSla
 all_slave_platforms = []
 for p in ACTIVE_PLATFORMS.keys():
     ACTIVE_PLATFORMS[p] = deepcopy(PLATFORMS[p])
     # Handle active slave platforms
     if p in ACTIVE_FX_SLAVE_PLATFORMS:
         for sp in ACTIVE_PLATFORMS[p]['slave_platforms'][:]:
             if sp not in ACTIVE_FX_SLAVE_PLATFORMS[p]:
                 ACTIVE_PLATFORMS[p]['slave_platforms'].remove(sp)
-                if sp in ACTIVE_PLATFORMS[p]:
-                    del ACTIVE_PLATFORMS[p][sp]
         if 'talos_slave_platforms' in ACTIVE_PLATFORMS[p]:
             for sp in ACTIVE_PLATFORMS[p]['talos_slave_platforms'][:]:
                 if sp not in ACTIVE_FX_SLAVE_PLATFORMS[p]:
                     ACTIVE_PLATFORMS[p]['talos_slave_platforms'].remove(sp)
-                    if sp in ACTIVE_PLATFORMS[p]:
-                        del ACTIVE_PLATFORMS[p][sp]
 
     all_slave_platforms.extend(ACTIVE_PLATFORMS[p]['slave_platforms'])
     if 'talos_slave_platforms' in ACTIVE_PLATFORMS[p]:
         all_slave_platforms.extend(ACTIVE_PLATFORMS[p]['talos_slave_platforms'])
 
 # Handle active platforms - Thunderbird
 tb_all_slave_platforms = []
 for p in ACTIVE_THUNDERBIRD_PLATFORMS.keys():

--- a/mozilla-tests/universal_master_sqlite.cfg
+++ b/mozilla-tests/universal_master_sqlite.cfg
@@ -68,25 +68,20 @@ from buildbot.buildslave import BuildSla
 all_slave_platforms = []
 for p in ACTIVE_PLATFORMS.keys():
     ACTIVE_PLATFORMS[p] = deepcopy(PLATFORMS[p])
     # Handle active slave platforms
     if p in ACTIVE_FX_SLAVE_PLATFORMS:
         for sp in ACTIVE_PLATFORMS[p]['slave_platforms'][:]:
             if sp not in ACTIVE_FX_SLAVE_PLATFORMS[p]:
                 ACTIVE_PLATFORMS[p]['slave_platforms'].remove(sp)
-                if sp in ACTIVE_PLATFORMS[p]:
-                    del ACTIVE_PLATFORMS[p][sp]
         if 'talos_slave_platforms' in ACTIVE_PLATFORMS[p]:
             for sp in ACTIVE_PLATFORMS[p]['talos_slave_platforms'][:]:
                 if sp not in ACTIVE_FX_SLAVE_PLATFORMS[p]:
                     ACTIVE_PLATFORMS[p]['talos_slave_platforms'].remove(sp)
-                    if sp in ACTIVE_PLATFORMS[p]:
-                        del ACTIVE_PLATFORMS[p][sp]
-
     all_slave_platforms.extend(ACTIVE_PLATFORMS[p]['slave_platforms'])
     if 'talos_slave_platforms' in ACTIVE_PLATFORMS[p]:
         all_slave_platforms.extend(ACTIVE_PLATFORMS[p]['talos_slave_platforms'])
 
 # Handle active platforms - Thunderbird
 tb_all_slave_platforms = []
 for p in ACTIVE_THUNDERBIRD_PLATFORMS.keys():
     #XXX we shouldn't have to filter these platforms