diff --git a/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
index 6c062458fea..a8eebcccdc9 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/linux/tinder-config.pl
@@ -44,7 +44,7 @@ $UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
 #$TestOnly          = 0;      # Only run tests, don't pull/build
 #$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
 #$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$BuildLocales      = 1;      # Do l10n packaging?
 
 # Tests
 $CleanProfile             = 1;
@@ -148,7 +148,6 @@ $moz_cvsroot   = ":ext:cltbld\@cvs.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-$Tinderbox_server = 'mattwillis@gmail.com';
 
 # Allow for non-client builds, e.g. camino.
 #$moz_client_mk = 'client.mk';
@@ -225,8 +224,7 @@ $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightl
 #$tbox_ftp_path = $ftp_path;
 #$tbox_url_path = $url_path;
 #$milestone     = "trunk";
-#$notify_list   = "build-announce\@mozilla.org";
-$notify_list   = "mattwillis\@gmail.com";
+$notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
diff --git a/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
index 8f36581f670..d4cc77c41bd 100755
--- a/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/macosx/tinder-config.pl
@@ -39,7 +39,7 @@ $UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
 #$TestOnly          = 0;      # Only run tests, don't pull/build
 #$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
 #$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$BuildLocales      = 1;      # Do l10n packaging?
 
 # Tests
 $CleanProfile             = 1;
@@ -142,7 +142,6 @@ $moz_cvsroot   = ":ext:cltbld\@cvs.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-$Tinderbox_server = 'mattwillis@gmail.com';
 
 # Allow for non-client builds, e.g. camino.
 #$moz_client_mk = 'client.mk';
@@ -220,8 +219,7 @@ $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightl
 #$tbox_ftp_path = $ftp_path;
 #$tbox_url_path = $url_path;
 #$milestone     = "trunk";
-#$notify_list   = "build-announce\@mozilla.org";
-$notify_list   = "mattwillis\@gmail.com";
+$notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 0;
 $archive       = 1;
diff --git a/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl b/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
index 838a2ccf23a..84c8c65fb38 100644
--- a/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
+++ b/mozilla/tools/tinderbox-configs/sunbird/win32/tinder-config.pl
@@ -55,7 +55,7 @@ $UseTimeStamp      = 0;      # Use the CVS 'pull-by-timestamp' option, or not
 #$TestOnly          = 0;      # Only run tests, don't pull/build
 #$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
 #$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-$BuildLocales      = 1;      # Do l10n packaging?
+#$BuildLocales      = 1;      # Do l10n packaging?
 
 # Tests
 $CleanProfile             = 1;
@@ -159,7 +159,6 @@ $moz_cvsroot   = ":ext:cltbld\@cvs.mozilla.org:/cvsroot";
 
 #- Set these proper values for your tinderbox server
 #$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-$Tinderbox_server = 'mattwillis@gmail.com';
 
 # Allow for non-client builds, e.g. camino.
 #$moz_client_mk = 'client.mk';
@@ -237,8 +236,7 @@ $url_path      = "http://ftp.mozilla.org/pub/mozilla.org/calendar/sunbird/nightl
 #$tbox_ftp_path = $ftp_path;
 #$tbox_url_path = $url_path;
 $milestone     = "trunk";
-#$notify_list   = "build-announce\@mozilla.org";
-$notify_list   = "mattwillis\@gmail.com";
+$notify_list   = "build-announce\@mozilla.org";
 $stub_installer = 0;
 $sea_installer = 1;
 $archive       = 1;