--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -1,17 +1,8 @@
-# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-# mixed up with host/target CPUs when trying to work out how to do the
-# universal build. When we redo the build system (bug 648979) this will
-# go away.
-if test -e "$topsrcdir/mail/config/version.txt"; then
-  unset CC
-  unset CXX
-fi
-
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --disable-install-strip
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 

--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -1,17 +1,8 @@
-# Big Hack that unsets CC / CXX so that mozconfig.common doesn't get
-# mixed up with host/target CPUs when trying to work out how to do the
-# universal build. When we redo the build system (bug 648979) this will
-# go away.
-if test -e "$topsrcdir/mail/config/version.txt"; then
-  unset CC
-  unset CXX
-fi
-
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # For NSS symbols