--- a/mozilla/config.py
+++ b/mozilla/config.py
@@ -62,16 +62,17 @@ GLOBAL_VARS = {
         'macosx64': {},
         'linux-debug': {},
         'linux64-br-haz': {},
         'linux64-debug': {},
         'linux64-asan': {},
         'linux64-asan-debug': {},
         'linux64-st-an-debug': {},
         'macosx64-debug': {},
+        'macosx64-st-an-debug': {},
         'win32-debug': {},
         'win64-debug': {},
         'android': {},
         'android-api-9': {},
         'android-api-11': {},
         'android-x86': {},
         'android-armv6': {},
         'android-debug': {},
@@ -1307,17 +1308,16 @@ PLATFORM_VARS = {
                 'extra_args': [
                     '--config', 'builds/releng_base_mac_64_builds.py',
                     '--custom-build-variant-cfg', 'stat-and-debug',
                 ],
                 'script_timeout': 3 * 3600,
                 'script_maxtime': int(5.5 * 3600),
             },
 
-            'try_by_default': False,
             'enable_nightly': False,
             'enable_xulrunner': False,
             'product_name': 'firefox',
             'app_name': 'browser',
             'brand_name': 'Minefield',
             'base_name': 'OS X 10.7 64-bit %(branch)s debug static analysis',
             'mozconfig': 'in_tree',
             'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug-static-analysis',
@@ -2244,17 +2244,16 @@ BRANCHES = {
     },
     'try': {
         'branch_projects': ['spidermonkey_try'],
         # The following platforms are not part of the default set,
         # so only run on Try.
         'extra_platforms': {
             'linux64-sh-haz': {},
             'linux64-cc': {},
-            'macosx64-st-an-debug': {},
         },
     },
 }
 
 setMainFirefoxVersions(BRANCHES)
 
 # Copy project branches into BRANCHES keys
 for branch in ACTIVE_PROJECT_BRANCHES:
@@ -2953,16 +2952,18 @@ for branch in ("try",):
     for pc in BRANCHES[branch]['platforms'].values():
         if 'enable_nonunified_build' in pc:
             pc['enable_nonunified_build'] = False
 
 # Static analysis happens only on m-c and derived branches.
 for name, branch in items_before(BRANCHES, 'gecko_version', mc_gecko_version):
     if 'linux64-st-an-debug' in branch['platforms']:
         del branch['platforms']['linux64-st-an-debug']
+    if 'macosx64-st-an-debug' in branch['platforms']:
+        del branch['platforms']['macosx64-st-an-debug']
 
 # Only test pretty names on train branches, not m-c or project branches.
 # That's also forced on nonunified builds in buildbotcustom.
 for branch in ("mozilla-aurora", "mozilla-beta", "mozilla-release",
                "mozilla-esr31"):
     for platform in ("linux", "linux64", "macosx64", "win32", "win64"):
         if platform in BRANCHES[branch]['platforms']:
             BRANCHES[branch]['platforms'][platform]['test_pretty_names'] = True