diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 72f31657636..9f2b6dea489 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -20,7 +20,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
 script_traits = {path = "../script_traits"}
-servo_config = {path = "../config", features = ["servo"]}
+servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry", features = ["servo"]}
 servo_url = {path = "../url", features = ["servo"]}
 style_traits = {path = "../style_traits"}
diff --git a/components/config/Cargo.toml b/components/config/Cargo.toml
index e42a2e4e5f2..b71dca3b548 100644
--- a/components/config/Cargo.toml
+++ b/components/config/Cargo.toml
@@ -9,10 +9,6 @@ publish = false
 name = "servo_config"
 path = "lib.rs"
 
-[features]
-# servo as opposed to geckolib
-servo = ["serde", "serde_derive", "servo_url/servo"]
-
 [dependencies]
 euclid = "0.11"
 getopts = "0.2.11"
@@ -20,10 +16,10 @@ lazy_static = "0.2"
 log = "0.3.5"
 num_cpus = "1.1.0"
 rustc-serialize = "0.3"
-serde = {version = "0.9", optional = true}
-serde_derive = {version = "0.9", optional = true}
+serde = {version = "0.9"}
+serde_derive = {version = "0.9"}
 servo_geometry = {path = "../geometry"}
-servo_url = {path = "../url"}
+servo_url = {path = "../url", features = ["servo"]}
 url = "1.2"
 
 [dev-dependencies]
diff --git a/components/config/lib.rs b/components/config/lib.rs
index 1a0c5b10186..a3de20ad73a 100644
--- a/components/config/lib.rs
+++ b/components/config/lib.rs
@@ -10,7 +10,7 @@ extern crate getopts;
 #[macro_use] extern crate log;
 extern crate num_cpus;
 extern crate rustc_serialize;
-#[cfg(feature = "servo")] #[macro_use] extern crate serde_derive;
+#[macro_use] extern crate serde_derive;
 extern crate servo_geometry;
 extern crate servo_url;
 extern crate url;
diff --git a/components/config/opts.rs b/components/config/opts.rs
index e62bade0cdc..2970ce57bcd 100644
--- a/components/config/opts.rs
+++ b/components/config/opts.rs
@@ -25,8 +25,7 @@ use url::{self, Url};
 
 
 /// Global flags for Servo, currently set on the command line.
-#[derive(Clone)]
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
+#[derive(Clone, Deserialize, Serialize)]
 pub struct Opts {
     pub is_running_problem_test: bool,
 
@@ -446,8 +445,7 @@ fn print_debug_usage(app: &str) -> ! {
     process::exit(0)
 }
 
-#[derive(Clone)]
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
+#[derive(Clone, Deserialize, Serialize)]
 pub enum OutputOptions {
     FileName(String),
     Stdout(f64)
diff --git a/components/config/prefs.rs b/components/config/prefs.rs
index fd07383f2b2..d2eb988f91f 100644
--- a/components/config/prefs.rs
+++ b/components/config/prefs.rs
@@ -20,8 +20,7 @@ lazy_static! {
     };
 }
 
-#[derive(PartialEq, Clone, Debug)]
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
+#[derive(PartialEq, Clone, Debug, Deserialize, Serialize)]
 pub enum PrefValue {
     Boolean(bool),
     String(String),
@@ -92,8 +91,7 @@ impl ToJson for PrefValue {
     }
 }
 
-#[derive(Clone, Debug)]
-#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 pub enum Pref {
     NoDefault(Arc<PrefValue>),
     WithDefault(Arc<PrefValue>, Option<Arc<PrefValue>>)
diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml
index 564fbf61815..5ea316ed475 100644
--- a/components/constellation/Cargo.toml
+++ b/components/constellation/Cargo.toml
@@ -33,7 +33,7 @@ script_traits = {path = "../script_traits"}
 serde = "0.9"
 serde_derive = "0.9"
 style_traits = {path = "../style_traits"}
-servo_config = {path = "../config", features = ["servo"]}
+servo_config = {path = "../config"}
 servo_rand = {path = "../rand"}
 servo_remutex = {path = "../remutex"}
 servo_url = {path = "../url", features = ["servo"]}
diff --git a/components/net_traits/Cargo.toml b/components/net_traits/Cargo.toml
index 96c3739b77d..fefe98482fe 100644
--- a/components/net_traits/Cargo.toml
+++ b/components/net_traits/Cargo.toml
@@ -24,7 +24,7 @@ msg = {path = "../msg"}
 num-traits = "0.1.32"
 serde = "0.9"
 serde_derive = "0.9"
-servo_config = {path = "../config", features = ["servo"]}
+servo_config = {path = "../config"}
 servo_url = {path = "../url", features = ["servo"]}
 url = {version = "1.2", features = ["heap_size"]}
 uuid = {version = "0.4", features = ["v4", "serde"]}
diff --git a/components/profile/Cargo.toml b/components/profile/Cargo.toml
index 275b3d92d19..fc8627e1a94 100644
--- a/components/profile/Cargo.toml
+++ b/components/profile/Cargo.toml
@@ -17,7 +17,7 @@ log = "0.3.5"
 serde = "0.9"
 serde_derive = "0.9"
 serde_json = "0.9"
-servo_config = {path = "../config", features = ["servo"]}
+servo_config = {path = "../config"}
 time = "0.1.12"
 
 [target.'cfg(target_os = "macos")'.dependencies]
diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml
index de9456ec1e7..5c9863f8aef 100644
--- a/components/script/Cargo.toml
+++ b/components/script/Cargo.toml
@@ -77,7 +77,7 @@ script_traits = {path = "../script_traits"}
 selectors = { path = "../selectors" }
 serde = "0.9"
 servo_atoms = {path = "../atoms"}
-servo_config = {path = "../config", features = ["servo"] }
+servo_config = {path = "../config"}
 servo_geometry = {path = "../geometry" }
 servo_rand = {path = "../rand"}
 servo_url = {path = "../url", features = ["servo"]}
diff --git a/components/webdriver_server/Cargo.toml b/components/webdriver_server/Cargo.toml
index b6a6019f7e5..edc5e8025bb 100644
--- a/components/webdriver_server/Cargo.toml
+++ b/components/webdriver_server/Cargo.toml
@@ -22,7 +22,7 @@ net_traits = {path = "../net_traits"}
 regex = "0.2"
 rustc-serialize = "0.3.4"
 script_traits = {path = "../script_traits"}
-servo_config = {path = "../config", features = ["servo"]}
+servo_config = {path = "../config"}
 servo_url = {path = "../url", features = ["servo"]}
 url = {version = "1.2", features = ["heap_size"]}
 uuid = {version = "0.4", features = ["v4"]}