--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,27 +1,16 @@
 . "$topsrcdir/build/mozconfig.comm-support"
-. "$topsrcdir/build/unix/mozconfig.linux32"
-. "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --with-l10n-base=../../l10n
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 ac_add_options --disable-stdcxx-compat

--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,27 +1,16 @@
 . "$topsrcdir/build/mozconfig.comm-support"
-. "$topsrcdir/build/unix/mozconfig.linux"
-. "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --with-l10n-base=../../l10n
 . "$topsrcdir/build/mozconfig.no-compile"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
-
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 ac_add_options --disable-stdcxx-compat

--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,15 +1,14 @@
 . "$topsrcdir/build/mozconfig.comm-support"
-. "$topsrcdir/build/macosx/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --disable-install-strip
-ac_add_options --enable-profiling
 ac_add_options --with-l10n-base=../../l10n
 . "$topsrcdir/build/mozconfig.no-compile"
 
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0

--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,29 +1,17 @@
 . "$topsrcdir/build/mozconfig.comm-support"
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --with-l10n-base=../../l10n
-. $topsrcdir/build/mozconfig.no-compile
-
-# Build lightning locales
-ac_add_options --enable-calendar
-
-# For NSS symbols
-export MOZ_DEBUG_SYMBOLS=1
+. "$topsrcdir/build/mozconfig.no-compile"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-l10n-args ] && cat $topsrcdir/build/client.py-l10n-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"

--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -1,27 +1,20 @@
-. "$topsrcdir/build/mozconfig.common"
-. "$topsrcdir/build/mozconfig.stylo"
+. "$topsrcdir/build/mozconfig.comm-support"
+. "$commtopsrcdir/mail/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
-ac_add_options --enable-application=mail
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-. $topsrcdir/build/mozconfig.no-compile
-
-# Build lightning locales
-ac_add_options --enable-calendar
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --with-l10n-base=../../l10n
+. "$topsrcdir/build/mozconfig.no-compile"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable checking that add-ons are signed by the trusted root
 MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
-# Run client.py
-mk_add_options CLIENT_PY_ARGS="$([ -f $topsrcdir/build/client.py-args ] && cat $topsrcdir/build/client.py-args)"
-mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
 # Use the TOOLTOOL provided xz for mar generation.
 mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"