diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure
index d661e92491a2..0055f25c10ea 100644
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -200,7 +200,6 @@ def old_configure_options(*options):
     '--enable-parental-controls',
     '--enable-posix-nspr-emulation',
     '--enable-pref-extensions',
-    '--enable-raw',
     '--enable-readline',
     '--enable-reflow-perf',
     '--enable-sandbox',
diff --git a/old-configure.in b/old-configure.in
index e55d905fac96..650d58a233cb 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -1902,7 +1902,6 @@ MOZ_AUTH_EXTENSION=1
 if test "$MOZ_IOS"; then
    MOZ_AUTH_EXTENSION=
 fi
-MOZ_RAW=
 MOZ_WEBRTC_HARDWARE_AEC_NS=
 VPX_USE_YASM=
 VPX_ASFLAGS=
@@ -1936,13 +1935,6 @@ case "$target_os" in
         ;;
 esac
 
-case "${target}" in
-    *-android*|*-linuxandroid*)
-        MOZ_RAW=1
-        ;;
-
-esac
-
 # Optional Firefox for Android partner distribution directory.
 MOZ_ARG_WITH_STRING(android-distribution-directory,
 [  --with-android-distribution-directory=dir
@@ -2339,7 +2331,6 @@ AC_TRY_COMPILE([#include <linux/ethtool.h>],
 AC_SUBST(MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI)
 
 if test -n "$MOZ_WEBRTC"; then
-    MOZ_RAW=1
     if test -n "$MOZ_X11"; then
       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
     fi
@@ -2360,20 +2351,6 @@ fi
 AC_SUBST(MOZ_WEBRTC_HARDWARE_AEC_NS)
 AC_SUBST_LIST(MOZ_WEBRTC_X11_LIBS)
 
-dnl ========================================================
-dnl = Enable Raw Codecs
-dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(raw,
-[  --enable-raw           Enable support for RAW media],
-    MOZ_RAW=1,
-    MOZ_RAW=)
-
-if test -n "$MOZ_RAW"; then
-    AC_DEFINE(MOZ_RAW)
-fi
-
-AC_SUBST(MOZ_RAW)
-
 dnl ========================================================
 dnl = Apple platform decoder support
 dnl ========================================================
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 0f2068c97de9..495148da0aae 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -983,6 +983,22 @@ set_define('MOZ_PEERCONNECTION', webrtc)
 set_config('MOZ_WEBRTC_ASSERT_ALWAYS', webrtc)
 set_define('MOZ_WEBRTC_ASSERT_ALWAYS', webrtc)
 
+# RAW media
+# ==============================================================
+
+@depends(target, webrtc)
+def raw_media_default(target, webrtc):
+    if target.os == 'Android':
+        return True
+    if webrtc:
+        return True
+
+option('--enable-raw', help='Enable support for RAW media',
+       default=raw_media_default)
+
+set_config('MOZ_RAW', depends_if('--enable-raw')(lambda _: True))
+set_define('MOZ_RAW', depends_if('--enable-raw')(lambda _: True))
+
 # ASan Reporter Addon
 # ==============================================================
 option('--enable-address-sanitizer-reporter',