--- a/misc.py
+++ b/misc.py
@@ -1288,17 +1288,16 @@ def generateBranchObjects(config, name, 
             extraRecipients = config['email_override']
             sendToInterestedUsers = False
 
         # This notifies users as soon as we receive their push, and will let them
         # know where to find builds/logs
         branchObjects['status'].append(ChangeNotifier(
             fromaddr="tryserver@build.mozilla.org",
             lookup=MercurialEmailLookup(),
-            relayhost="mail.build.mozilla.org",
             sendToInterestedUsers=sendToInterestedUsers,
             extraRecipients=extraRecipients,
             branches=[config['repo_path']],
             messageFormatter=lambda c: buildTryChangeMessage(c,
                                                              '/'.join([packageUrl, packageDir])),
         ))
 
     tipsOnly = False

--- a/process/release.py
+++ b/process/release.py
@@ -1935,32 +1935,30 @@ def generateReleaseBranchObjects(release
     # messages in this case. See Bug 635527 for the details.
     tagging_started_recipients = releaseConfig['AllRecipients'][:]
     if not releaseConfig.get('skip_tag'):
         tagging_started_recipients.extend(releaseConfig['ImportantRecipients'])
     for recipient in tagging_started_recipients:
         # send a message when we receive the sendchange and start tagging
         status.append(ChangeNotifier(
             fromaddr="release@mozilla.com",
-            relayhost="mail.build.mozilla.org",
             sendToInterestedUsers=False,
             extraRecipients=[recipient],
             extraHeaders={'Message-Id': email_message_id},
             branches=[sourceRepoInfo['path']],
             messageFormatter=createReleaseChangeMessage,
             changeIsImportant=lambda c:
             changeContainsProduct(c, releaseConfig['productName']) and
             changeContainsScriptRepoRevision(c, releaseTag)
         ))
     for recipient in releaseConfig['ImportantRecipients']:
         if hasPlatformSubstring(releaseConfig['enUSPlatforms'], 'android'):
             # send a message when android signing is complete
             status.append(ChangeNotifier(
                 fromaddr="release@mozilla.com",
-                relayhost="mail.build.mozilla.org",
                 sendToInterestedUsers=False,
                 extraRecipients=[recipient],
                 extraHeaders={'In-Reply-To': email_message_id,
                               'References': email_message_id},
                 branches=[builderPrefix('android_post_signing')],
                 messageFormatter=createReleaseChangeMessage,
                 changeIsImportant=lambda c:
                 changeContainsProperties(c, dict(who=enUS_signed_apk_url))
@@ -1970,30 +1968,28 @@ def generateReleaseBranchObjects(release
     status.append(MailNotifier(
         fromaddr='release@mozilla.com',
         sendToInterestedUsers=False,
         extraRecipients=releaseConfig['AllRecipients'],
         extraHeaders={'In-Reply-To': email_message_id,
                       'References': email_message_id},
         mode='all',
         builders=[b['name'] for b in builders + test_builders],
-        relayhost='mail.build.mozilla.org',
         messageFormatter=createReleaseMessage,
     ))
 
     if releaseConfig.get('AVVendorsRecipients'):
         status.append(MailNotifier(
             fromaddr='release@mozilla.com',
             sendToInterestedUsers=False,
             extraRecipients=releaseConfig['AVVendorsRecipients'],
             extraHeaders={'In-Reply-To': email_message_id,
                           'References': email_message_id},
             mode='passing',
             builders=[builderPrefix('%s_updates' % releaseConfig['productName'])],
-            relayhost='mail.build.mozilla.org',
             messageFormatter=createReleaseAVVendorsMessage,
         ))
 
     builders.extend(test_builders)
 
     # Don't merge release builder requests
     nomergeBuilders.update([b['name'] for b in builders + test_builders])