diff --git a/metadata/org.mozilla.fennec_fdroid.txt b/metadata/org.mozilla.fennec_fdroid.txt
index dd0e33ed41..29b474994e 100644
--- a/metadata/org.mozilla.fennec_fdroid.txt
+++ b/metadata/org.mozilla.fennec_fdroid.txt
@@ -2127,30 +2127,18 @@ Build:40.0,400010
         zip -d fdroid/fennec-unsigned.apk "META-INF*"
 
 # testing, requires skip-scan, doesnt build
-Build:41.0,410010
-    disable=test
-    commit=FENNEC_41_0_RELEASE
+Build:42.0,420010
+    disable=wants to configure mach and hg interactively
+    commit=FENNEC_42_0_RELEASE
     output=fdroid/fennec-unsigned.apk
-    srclibs=MozLocales@f4abaa2ece7fb6c56cb75222c9df7355010ff661
+    srclibs=MozLocales@dd882b1c1881b9f3c43a23b0a9412a49d8c53505
     prebuild=mkdir fdroid && \
         fxarch=i386-linux-androideabi && \
         l10ndir=`readlink -f $$MozLocales$$` && \
-        sed -i -e 's|about:feedback|https://gitlab.com/fdroid/fdroiddata/issues|g' mobile/android/base/resources/xml/preferences_vendor.xml && \
-        sed -i -e 's/android:debuggable="true"//g' mobile/android/base/AndroidManifest.xml.in && \
-        sed -i -e '/MOZ_SERVICES_HEALTHREPORT/d' -e '/MOZ_DEVICES/d' -e '/MOZ_SAFE_BROWSING/d' -e '/MOZ_ANDROID_RESOURCE_CONSTRAINED/,+2d' mobile/android/confvars.sh && \
-        echo -e 'MOZ_DEVICES=\nMOZ_NATIVE_DEVICES=\nMOZ_SERVICES_HEALTHREPORT=\nMOZ_SAFE_BROWSING=\n' >> mobile/android/confvars.sh && \
-        sed -i -e '/MOZ_ANDROID_GOOGLE_PLAY_SERVICES/d' configure.in && \
-        find . -type f -name moz.build -print0 | xargs -0 sed -i -e "/FAIL_ON_WARNINGS = True/s/True/False/g" && \
         echo "ac_add_options --with-android-ndk=\"$$NDK$$\"" > .mozconfig && \
         echo "ac_add_options --with-android-sdk=\"$$SDK$$/platforms/android-22\"" >> .mozconfig && \
         echo "ac_add_options --enable-application=mobile/android" >> .mozconfig && \
         echo "ac_add_options --target=${fxarch}" >> .mozconfig && \
-        echo "ac_add_options --disable-tests" >> .mozconfig && \
-        echo "ac_add_options --disable-updater" >> .mozconfig && \
-        echo "ac_add_options --disable-eme" >> .mozconfig && \
-        echo "ac_add_options --disable-mochitest" >> .mozconfig && \
-        echo "ac_add_options --disable-crashreporter" >> .mozconfig && \
-        echo "ac_add_options --disable-debug" >> .mozconfig && \
         echo "ac_add_options --with-branding=mobile/android/branding/unofficial" >> .mozconfig && \
         echo "ac_add_options --with-l10n-base=${l10ndir}" >> .mozconfig && \
         echo "mk_add_options 'export L10NBASEDIR=${l10ndir}'" >> .mozconfig && \
@@ -2161,19 +2149,7 @@ Build:41.0,410010
         echo 'ANDROID_PACKAGE_NAME=org.mozilla.fennec_fdroid' >> configure.sh && \
         echo 'MOZ_APP_DISPLAYNAME="Fennec F-Droid"' >> configure.sh && \
         popd && \
-        sed -i -e 's/size_impl(v/size_impl(const v/g' memory/mozjemalloc/jemalloc.c && \
-        rm -R mobile/android/gradle/ && \
-        sed -i -e '/gradle/d' mobile/android/moz.build && \
-        sed -i -e '/gmp-provider/d' mobile/android/app/mobile.js && \
-        echo 'pref("media.gmp-provider.enabled", false);' >> mobile/android/app/mobile.js && \
-        echo 'pref("media.gmp-manager.url.override", "data:text/plain,");' >> mobile/android/app/mobile.js && \
-        echo 'pref("media.gmp-gmpopenh264.enabled", false);' >> mobile/android/app/mobile.js && \
-        sed -i -e '/casting.enabled/d' mobile/android/app/mobile.js && \
-        echo 'pref("browser.casting.enabled", false);' >> mobile/android/app/mobile.js && \
-        sed -i -e '/datareporting.healthreport.uploadEnabled/s/true/false/g' -e '/datareporting.healthreport.service.enabled/s/true/false/g' ./services/healthreport/healthreport-prefs.js && \
-        sed -i -e '/android.not_a_preference.healthreport.uploadEnabled/,+3s/android:defaultValue="true"/android:defaultValue="false"/g' mobile/android/base/resources/xml/preferences_vendor.xml
-    scanignore=mobile/android/base/JavaAddonManager.java
-    build=./mach build && \
+        build=./mach build && \
         fxarch=`grep "ac_add_options --target=" .mozconfig | cut -d '=' -f2` && \
         pushd obj-${fxarch}/mobile/android/locales && \
         for loc in $(cat ../../../../mobile/android/locales/maemo-locales); do LOCALE_MERGEDIR=$PWD/merge-$loc make merge-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; make LOCALE_MERGEDIR=$PWD/merge-$loc chrome-$loc LOCALE_MERGEDIR=$PWD/merge-$loc; done && \