--- a/thunderbird/config.py
+++ b/thunderbird/config.py
@@ -41,17 +41,17 @@ DEFAULTS = {
     'builder_type':           "build",
     'tinderbox_tree':         "ThunderbirdTest",
     'codesighs':               False,
     'product_name':           'Thunderbird',
     'brand_name':             'Shredder',
     
     # Unit Test
     'poll_branch':          'comm-central',
-    'client_py_args':       ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time --traceback'],
+    'client_py_args':       ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time'],
     'platforms': {
       'linux':  "Linux", 
       'win32':  "Win2k3",
       'osx':    "MacOSX 10.4",
     },
 
     'clobber_url':  "http://build.mozillamessaging.com/clobberer/",
     'build_tools_repo': "build/tools",
@@ -133,17 +133,17 @@ BRANCHES['comm-central-unittest'] = {
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-central']['platforms'] = {
     'linux': {},
     'win32': {},
     'macosx': {},
     'macosx-shark': {},
 }
 BRANCHES['comm-central']['mozilla_central_branch'] = 'releases/mozilla-1.9.1'
-BRANCHES['comm-central']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time --traceback']
+BRANCHES['comm-central']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time']
 BRANCHES['comm-central']['cvsroot'] = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'
 BRANCHES['comm-central']['mozconfig'] = 'mozconfig'
 BRANCHES['comm-central']['package'] = True
 BRANCHES['comm-central']['branch_name'] = 'comm-1.9.1'
 #Disable when producing release builds
 #BRANCHES['comm-central']['nightly'] = False
 BRANCHES['comm-central']['upload_stage'] = True
 BRANCHES['comm-central']['milestone'] = 'comm-1.9.1'
@@ -237,17 +237,17 @@ BRANCHES['comm-central']['platforms']['m
 ######## thunderbird-hg
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-central-trunk']['platforms'] = {
     'linux': {},
     'win32': {},
     'macosx': {},
 }
 BRANCHES['comm-central-trunk']['mozilla_central_branch'] = 'mozilla-central'
-BRANCHES['comm-central-trunk']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--mozilla-repo=http://hg.mozilla.org/mozilla-central','--hg-options=--verbose --time --traceback']
+BRANCHES['comm-central-trunk']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--mozilla-repo=http://hg.mozilla.org/mozilla-central','--hg-options=--verbose --time']
 BRANCHES['comm-central-trunk']['cvsroot'] = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'
 BRANCHES['comm-central-trunk']['mozconfig'] = 'mozconfig'
 BRANCHES['comm-central-trunk']['hg_branch'] = 'comm-central'
 BRANCHES['comm-central-trunk']['package'] = True
 #Disable when producing release builds
 #BRANCHES['comm-central-trunk']['nightly'] = False
 BRANCHES['comm-central-trunk']['upload_stage'] = True
 BRANCHES['comm-central-trunk']['milestone'] = 'comm-central-trunk'
@@ -509,17 +509,17 @@ BRANCHES['comm-central-sunbird']['platfo
 BRANCHES['comm-central-bloat']['platforms'] = {
     'linux': {},
     'win32': {},
     'macosx': {},
 }
 
 BRANCHES['comm-central-bloat']['mozilla_central_branch'] = 'releases/mozilla-1.9.1'
 BRANCHES['comm-central-bloat']['branch_name'] = 'comm-1.9.1'
-BRANCHES['comm-central-bloat']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time --traceback']
+BRANCHES['comm-central-bloat']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--hg-options=--verbose --time']
 BRANCHES['comm-central-bloat']['cvsroot'] = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'
 BRANCHES['comm-central-bloat']['mozconfig'] = 'mozconfig-bloat'
 BRANCHES['comm-central-bloat']['hg_branch'] = 'comm-central'
 BRANCHES['comm-central-bloat']['nightly'] = False
 BRANCHES['comm-central-bloat']['leak'] = True
 BRANCHES['comm-central-bloat']['package'] = False
 BRANCHES['comm-central-bloat']['upload_stage'] = False
 BRANCHES['comm-central-bloat']['codesighs'] = False
@@ -593,17 +593,17 @@ BRANCHES['comm-central-bloat']['platform
 # All platforms being built for this branch MUST be listed here.
 BRANCHES['comm-central-trunk-bloat']['platforms'] = {
     'linux': {},
     'win32': {},
     'macosx': {},
 }
 
 BRANCHES['comm-central-trunk-bloat']['mozilla_central_branch'] = 'mozilla-central'
-BRANCHES['comm-central-trunk-bloat']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--mozilla-repo=http://hg.mozilla.org/mozilla-central', '--hg-options=--verbose --time --traceback']
+BRANCHES['comm-central-trunk-bloat']['client_py_args'] = ['--skip-comm', '--skip-chatzilla', '--skip-venkman', '--mozilla-repo=http://hg.mozilla.org/mozilla-central', '--hg-options=--verbose --time']
 BRANCHES['comm-central-trunk-bloat']['cvsroot'] = ':pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot'
 BRANCHES['comm-central-trunk-bloat']['mozconfig'] = 'mozconfig-bloat'
 BRANCHES['comm-central-trunk-bloat']['hg_branch'] = 'comm-central'
 BRANCHES['comm-central-trunk-bloat']['builder_type'] = 'bloat'
 BRANCHES['comm-central-trunk-bloat']['nightly'] = False
 BRANCHES['comm-central-trunk-bloat']['leak'] = True
 BRANCHES['comm-central-trunk-bloat']['package'] = False
 BRANCHES['comm-central-trunk-bloat']['upload_stage'] = False