--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -33,31 +33,24 @@ android {
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
 
     dexOptions {
         javaMaxHeapSize "2g"
+        jumboMode = true
     }
 
     lintOptions {
         abortOnError true
     }
 
     buildTypes {
-        // Bug 1367768: With current code, we need jumboMode for a string table larger than 65536.
-        // To not interrupt release 55 nightly to beta merge, jumboMode only applies to debug now
-        // and will apply to all builds very soon (Mid June 2017, see bug 1370156).
-        debug {
-            dexOptions {
-                jumboMode = true
-            }
-        }
         // We have the following difficult situation.  Minification (Proguard) is only available per
         // Android-Gradle `buildType`.  Instrumentation (Robocop) is only available for exactly one
         // `buildType` (see Android-Gradle `testBuildType`, which defaults to "debug").  Local
         // developers expect to build and run tests against the "debug" build type.  Automation
         // needs to produce an instrumentation (Robocop) APK against a Fennec APK that will ship.
         // (This is very unusual; usually, instrumentation tests do _not_ run against a shipping
         // APK.)
         //