diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index adf5e0b5c03..852fe1dbe66 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -17,7 +17,6 @@ googlevr = ["webxr/googlevr"]
 jitspew = ["script/jitspew"]
 js_backtrace = ["script/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
-media-dummy = ["servo-media-dummy"]
 media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
 native-bluetooth = ["bluetooth/native-bluetooth"]
 no-wgl = ["canvas/no-wgl"]
@@ -67,7 +66,7 @@ script = { path = "../script" }
 script_layout_interface = { path = "../script_layout_interface" }
 script_traits = { path = "../script_traits" }
 servo-media = { git = "https://github.com/servo/media" }
-servo-media-dummy = { git = "https://github.com/servo/media", optional = true }
+servo-media-dummy = { git = "https://github.com/servo/media" }
 servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
 servo_config = { path = "../config" }
 servo_geometry = { path = "../geometry" }
diff --git a/components/servo/lib.rs b/components/servo/lib.rs
index da43cc672cf..2f7ba40d549 100644
--- a/components/servo/lib.rs
+++ b/components/servo/lib.rs
@@ -171,7 +171,7 @@ mod media_platform {
     }
 }
 
-#[cfg(feature = "media-dummy")]
+#[cfg(not(feature = "media-gstreamer"))]
 mod media_platform {
     use super::ServoMedia;
     pub fn init() {
diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml
index 17ce97834fe..d6becc3c81c 100644
--- a/ports/libsimpleservo/api/Cargo.toml
+++ b/ports/libsimpleservo/api/Cargo.toml
@@ -40,7 +40,6 @@ googlevr = ["libservo/googlevr"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
-media-dummy = ["libservo/media-dummy"]
 media-gstreamer = ["libservo/media-gstreamer"]
 native-bluetooth = ["libservo/native-bluetooth"]
 no_static_freetype = ["libservo/no_static_freetype"]
diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml
index 92f2bd97f5a..73ad52c3cf6 100644
--- a/ports/libsimpleservo/capi/Cargo.toml
+++ b/ports/libsimpleservo/capi/Cargo.toml
@@ -35,7 +35,6 @@ googlevr = ["simpleservo/googlevr"]
 jitspew = ["simpleservo/jitspew"]
 js_backtrace = ["simpleservo/js_backtrace"]
 max_log_level = ["simpleservo/max_log_level"]
-media-dummy = ["simpleservo/media-dummy"]
 media-gstreamer = ["simpleservo/media-gstreamer"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 no-wgl = ["simpleservo/no-wgl"]
diff --git a/ports/libsimpleservo/jniapi/Cargo.toml b/ports/libsimpleservo/jniapi/Cargo.toml
index ea39b9d71d3..3af02e5e1fb 100644
--- a/ports/libsimpleservo/jniapi/Cargo.toml
+++ b/ports/libsimpleservo/jniapi/Cargo.toml
@@ -32,7 +32,6 @@ default = ["max_log_level", "native-bluetooth", "webdriver"]
 googlevr = ["simpleservo/googlevr"]
 js_backtrace = ["simpleservo/js_backtrace"]
 max_log_level = ["simpleservo/max_log_level"]
-media-dummy = ["simpleservo/media-dummy"]
 media-gstreamer = ["simpleservo/media-gstreamer"]
 native-bluetooth = ["simpleservo/native-bluetooth"]
 webdriver = ["simpleservo/webdriver"]
diff --git a/ports/servoshell/Cargo.toml b/ports/servoshell/Cargo.toml
index cddfb062003..2d532b29c6a 100644
--- a/ports/servoshell/Cargo.toml
+++ b/ports/servoshell/Cargo.toml
@@ -34,7 +34,6 @@ default = ["max_log_level", "native-bluetooth", "webdriver"]
 jitspew = ["libservo/jitspew"]
 js_backtrace = ["libservo/js_backtrace"]
 max_log_level = ["log/release_max_level_info"]
-media-dummy = ["libservo/media-dummy"]
 media-gstreamer = ["libservo/media-gstreamer"]
 native-bluetooth = ["libservo/native-bluetooth"]
 no-wgl = ["libservo/no-wgl"]
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 09da1491a8f..8235829aa97 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -461,10 +461,9 @@ class CommandBase(object):
         """Return an extended environment dictionary."""
         env = os.environ.copy()
 
-        if "media-dummy" not in self.features:
-            servo.platform.get().set_gstreamer_environment_variables_if_necessary(
-                env, cross_compilation_target=self.cross_compile_target,
-                check_installation=is_build)
+        servo.platform.get().set_gstreamer_environment_variables_if_necessary(
+            env, cross_compilation_target=self.cross_compile_target,
+            check_installation=is_build)
 
         effective_target = self.cross_compile_target or servo.platform.host_triple()
         if "msvc" in effective_target:
@@ -850,7 +849,8 @@ class CommandBase(object):
                 media_stack = "gstreamer"
             else:
                 media_stack = "dummy"
-        self.features += ["media-" + media_stack]
+        if media_stack != "dummy":
+            self.features += ["media-" + media_stack]
 
     def run_cargo_build_like_command(
         self, command: str, cargo_args: List[str],