--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -1,14 +1,9 @@
 no_tooltool=1
-if [ $topsrcdir == *"mozilla" ]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 
 ac_add_options --enable-debug
 
 ac_add_options --enable-tests
 
@@ -26,12 +21,8 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
-if [ ! -z "$oldtopsrcdir" ]; then
-    topsrcdir=$oldtopsrcdir
-    oldtopsrcdir=""
-fi

--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -1,14 +1,9 @@
 no_tooltool=1
-if [ $topsrcdir == *"mozilla" ]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux32"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -33,12 +28,8 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
-if [ ! -z "$oldtopsrcdir" ]; then
-    topsrcdir=$oldtopsrcdir
-    oldtopsrcdir=""
-fi

--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -1,15 +1,9 @@
 no_tooltool=1
-oldtopsrcdir=""
-if [ $topsrcdir == *"mozilla" ]; then
-  oldtopsrcdir=$topsrcdir
-  topsrcdir=$(dirname $topsrcdir)
-fi
-
 . "$topsrcdir/build/unix/mozconfig.linux"
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-optimize
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --disable-debug
 ac_add_options --enable-tests
@@ -35,13 +29,8 @@ export MOZILLA_OFFICIAL=1
 #Use ccache
 ac_add_options --with-ccache=/usr/bin/ccache
 
 . "$topsrcdir/suite/config/mozconfigs/mozconfig.linux.common"
 
 export PKG_CONFIG_LIBDIR=/usr/lib64/pkgconfig:/usr/share/pkgconfig
 . "$topsrcdir/build/unix/mozconfig.gtk"
 
-if [ ! -z "$oldtopsrcdir" ]; then
-    topsrcdir=$oldtopsrcdir
-    oldtopsrcdir=""
-fi
-