--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -5,18 +5,14 @@ ac_add_options --enable-dmd
 ac_add_options --enable-verify-mar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"

--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@@ -4,20 +4,16 @@ ac_add_options --enable-application=brow
 ac_add_options --enable-debug
 ac_add_options --enable-optimize="-O1"
 
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"

--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -8,20 +8,16 @@ if test `uname -s` = "Linux"; then
   export DMG_TOOL=$topsrcdir/dmg/dmg
   export HFS_TOOL=$topsrcdir/dmg/hfsplus
 fi
 
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --with-branding=browser/branding/nightly
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 export MOZILLA_OFFICIAL=1
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
 mk_add_options AUTOCLOBBER=

--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/browser/config/mozconfigs/macosx64/nightly
@@ -5,18 +5,11 @@ ac_add_options --enable-verify-mar
 ac_add_options --enable-profiling
 ac_add_options --enable-instruments
 
 # Cross-compiled builds fail when dtrace is enabled
 if test `uname -s` != Linux; then
   ac_add_options --enable-dtrace
 fi
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 ac_add_options --with-branding=browser/branding/nightly
 
 . "$topsrcdir/build/mozconfig.common.override"

--- a/browser/config/mozconfigs/macosx64/nightly-asan
+++ b/browser/config/mozconfigs/macosx64/nightly-asan
@@ -3,20 +3,16 @@ ac_add_options --enable-application=brow
 ac_add_options --disable-debug
 ac_add_options --enable-optimize="-O2"
 
 . $topsrcdir/build/unix/mozconfig.asan
 
 # Enable Telemetry
 export MOZ_TELEMETRY_REPORTING=1
 
-if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
-ac_add_options --with-macbundlename-prefix=Firefox
-fi
-
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 # Need this to prevent name conflicts with the normal nightly build packages
 # Before mozconfig.common so we can test for asan builds there
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/macosx/mozconfig.common"

--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -18,19 +18,16 @@ whitelist['nightly']['linux32'] += [
 ]
 
 whitelist['nightly']['linux64'] += [
     'STRIP_FLAGS="--strip-debug"',
 ]
 
 whitelist['nightly']['macosx64'] += [
     'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then',
-    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly-try"; then',
-    'ac_add_options --with-macbundlename-prefix=Firefox',
-    'fi',
     'ac_add_options --disable-install-strip',
     'ac_add_options --enable-instruments',
     'ac_add_options --enable-dtrace',
     'if test `uname -s` != Linux; then',
 ]
 
 whitelist['nightly']['win64'] += [
     '. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"',