--- a/old-configure.in
+++ b/old-configure.in
@@ -6072,23 +6072,29 @@ fi
 
 if test "$MOZ_WIDGET_TOOLKIT" = "cocoa"; then
     USE_ICU=1
 fi
 
 MOZ_CONFIG_ICU()
 
 dnl ========================================================
-dnl mask as short hand property
-dnl ========================================================
-dnl Uncommenting the next line would enable mask-as-shorthand feature.
-dnl MOZ_ENABLE_MASK_AS_SHORTHAND=1
-if test "$MOZ_ENABLE_MASK_AS_SHORTHAND"; then
+dnl mask as shorthand property
+dnl ========================================================
+
+# The control structure code will be removed as soon as the feature is stable
+# Refer to bug 1281101 for more details.
+
+# Enable mask-as-shorthand property by default for nightly and aurora channels
+if test -z "$RELEASE_BUILD"; then
+  dnl mask as shorthand property enabled
+  MOZ_ENABLE_MASK_AS_SHORTHAND=1
   AC_DEFINE(MOZ_ENABLE_MASK_AS_SHORTHAND)
 fi
+
 AC_SUBST(MOZ_ENABLE_MASK_AS_SHORTHAND)
 
 # Avoid using obsolete NSPR features
 AC_DEFINE(NO_NSPR_10_SUPPORT)
 
 # Don't build NSS libpkix
 NSS_DISABLE_LIBPKIX=1
 AC_SUBST(NSS_DISABLE_LIBPKIX)