diff --git a/Cargo.lock b/Cargo.lock
index 0eee8c96a22..67bbe5be971 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2848,7 +2848,7 @@ dependencies = [
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3039,7 +3039,7 @@ dependencies = [
  "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-media 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
+ "servo-media 0.1.0 (git+https://github.com/servo/media)",
  "servo_allocator 0.0.1",
  "servo_arc 0.1.1",
  "servo_atoms 0.0.1",
@@ -3271,17 +3271,17 @@ dependencies = [
 [[package]]
 name = "servo-media"
 version = "0.1.0"
-source = "git+https://github.com/ferjm/media?branch=enable.gst.android#e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b"
+source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48"
 dependencies = [
- "servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
- "servo-media-gstreamer 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
- "servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
+ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)",
+ "servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)",
+ "servo-media-player 0.1.0 (git+https://github.com/servo/media)",
 ]
 
 [[package]]
 name = "servo-media-audio"
 version = "0.1.0"
-source = "git+https://github.com/ferjm/media?branch=enable.gst.android#e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b"
+source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48"
 dependencies = [
  "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3290,14 +3290,14 @@ dependencies = [
  "petgraph 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo_media_derive 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
+ "servo_media_derive 0.1.0 (git+https://github.com/servo/media)",
  "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "servo-media-gstreamer"
 version = "0.1.0"
-source = "git+https://github.com/ferjm/media?branch=enable.gst.android#e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b"
+source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48"
 dependencies = [
  "byte-slice-cast 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "glib 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3307,15 +3307,15 @@ dependencies = [
  "gstreamer-player 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
- "servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)",
+ "servo-media-audio 0.1.0 (git+https://github.com/servo/media)",
+ "servo-media-player 0.1.0 (git+https://github.com/servo/media)",
  "zip 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "servo-media-player"
 version = "0.1.0"
-source = "git+https://github.com/ferjm/media?branch=enable.gst.android#e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b"
+source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48"
 dependencies = [
  "ipc-channel 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.66 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3410,7 +3410,7 @@ dependencies = [
 [[package]]
 name = "servo_media_derive"
 version = "0.1.0"
-source = "git+https://github.com/ferjm/media?branch=enable.gst.android#e0bfb276e2d2b5d09d994e3c068ce09e9a79fa7b"
+source = "git+https://github.com/servo/media#e700a0834c3f38d49890d846591fd699e7405a48"
 dependencies = [
  "quote 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4591,12 +4591,12 @@ dependencies = [
 "checksum servo-fontconfig 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93f799b649b4a2bf362398910eca35240704c7e765e780349b2bb1070d892262"
 "checksum servo-fontconfig-sys 4.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b46d201addcfbd25c1798ad1281d98c40743824e0b0f1e611bd3d5d0d31a7b8d"
 "checksum servo-freetype-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d00ab791f66cd2ec58e72c91b6076cee20fac560463aa871404eb31dfc9c4ff"
-"checksum servo-media 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)" = "<none>"
-"checksum servo-media-audio 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)" = "<none>"
-"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)" = "<none>"
-"checksum servo-media-player 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)" = "<none>"
+"checksum servo-media 0.1.0 (git+https://github.com/servo/media)" = "<none>"
+"checksum servo-media-audio 0.1.0 (git+https://github.com/servo/media)" = "<none>"
+"checksum servo-media-gstreamer 0.1.0 (git+https://github.com/servo/media)" = "<none>"
+"checksum servo-media-player 0.1.0 (git+https://github.com/servo/media)" = "<none>"
 "checksum servo-skia 0.30000019.1 (registry+https://github.com/rust-lang/crates.io-index)" = "82eddddcf9512dd7c60eccdb486e60e5bd4930afaa4da2d7d4afdff75950fb88"
-"checksum servo_media_derive 0.1.0 (git+https://github.com/ferjm/media?branch=enable.gst.android)" = "<none>"
+"checksum servo_media_derive 0.1.0 (git+https://github.com/servo/media)" = "<none>"
 "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 "checksum shared_library 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8254bf098ce4d8d7cc7cc6de438c5488adc5297e5b7ffef88816c0a91bd289c1"
 "checksum sig 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6649e43c1a1e68d29ed56d0dc3b5b6cf3b901da77cf107c4066b9e3da036df5"
diff --git a/Cargo.toml b/Cargo.toml
index b50cfca0e52..069fd75fc96 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,5 +27,3 @@ opt-level = 3
 #
 #     [patch."https://github.com/servo/<repository>"]
 #     <crate> = { path = "/path/to/local/checkout" }
-[patch."https://github.com/servo/media"]
-servo-media = { git = "https://github.com/ferjm/media", branch = "enable.gst.android" }