--- a/mobile/android/config/mozconfigs/common
+++ b/mobile/android/config/mozconfigs/common
@@ -3,20 +3,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # This file is included at the top of all native android mozconfigs
 if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}
 fi
 
 if [ -z "$NO_NDK" ]; then
-  # MOZ_UPDATE_CHANNEL isn't always set.  It cannot use to detect as trunk.
-  if [ `tail -1 "$topsrcdir/config/milestone.txt" | grep 'a1'` ] ; then
-    . "$topsrcdir/build/mozconfig.stylo"
-  fi
+  . "$topsrcdir/build/mozconfig.stylo"
 fi
 
 MOZ_AUTOMATION_L10N_CHECK=0
 . "$topsrcdir/build/mozconfig.common"
 
 # For actual Android builds in TaskCluster, the system image is Debian,
 # and we use the Java JRE/JDK from the system, as well as the system
 # GCC for the host compiler.  l10n builds are still special, however:

--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -561,32 +561,26 @@ id_and_secret_keyfile('Leanplum SDK')
 
 simple_keyfile('Pocket API')
 
 # Servo integration
 # ==============================================================
 option('--enable-stylo', nargs='?', choices=('build',),
        help='Include Stylo in the build and/or enable it at runtime')
 
-@depends('--enable-stylo', '--help', target, milestone)
-def stylo_config(value, _, target, milestone):
+@depends('--enable-stylo', '--help')
+def stylo_config(value, _):
     build_stylo = None
     enable_stylo = None
 
     # If nothing is specified, default to building and enabling Stylo where it
     # is known to work.
     if value.origin == 'default':
-        # Build stylo on Android Nighly, but this is still turned off yet.
-        if target.os == 'Android':
-            if milestone.is_nightly:
-                build_stylo = True
-                enable_stylo = None
-        else:
-            build_stylo = True
-            enable_stylo = True
+        build_stylo = True
+        enable_stylo = True
     elif len(value) and value[0] == 'build':
         # Build but disable by request.
         build_stylo = True
     elif bool(value):
         # Build and enable.
         build_stylo = True
         enable_stylo = True