diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index 40e5b724f1a..51d48fd00ca 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -21,7 +21,7 @@ net_traits = {path = "../net_traits"}
 profile_traits = {path = "../profile_traits"}
 script_traits = {path = "../script_traits"}
 servo_config = {path = "../config"}
-servo_geometry = {path = "../geometry", features = ["servo"]}
+servo_geometry = {path = "../geometry"}
 servo_url = {path = "../url"}
 style_traits = {path = "../style_traits"}
 time = "0.1.17"
diff --git a/components/geometry/Cargo.toml b/components/geometry/Cargo.toml
index 956337a06cc..68da8f383f1 100644
--- a/components/geometry/Cargo.toml
+++ b/components/geometry/Cargo.toml
@@ -9,10 +9,6 @@ publish = false
 name = "servo_geometry"
 path = "lib.rs"
 
-[features]
-# servo as opposed to geckolib
-servo = ["euclid/unstable"]
-
 [dependencies]
 app_units = "0.5"
 euclid = "0.15"
diff --git a/components/layout_thread/Cargo.toml b/components/layout_thread/Cargo.toml
index b83c648b0a6..eea55c032df 100644
--- a/components/layout_thread/Cargo.toml
+++ b/components/layout_thread/Cargo.toml
@@ -9,6 +9,9 @@ publish = false
 name = "layout_thread"
 path = "lib.rs"
 
+[features]
+unstable = ["parking_lot/nightly"]
+
 [dependencies]
 app_units = "0.5"
 atomic_refcell = "0.1"
@@ -26,7 +29,7 @@ log = "0.3.5"
 metrics = {path = "../metrics"}
 msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
-parking_lot = {version = "0.4", features = ["nightly"]}
+parking_lot = "0.4"
 profile_traits = {path = "../profile_traits"}
 range = {path = "../range"}
 rayon = "0.8"
diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml
index 24e60111214..efc51ea0840 100644
--- a/components/servo/Cargo.toml
+++ b/components/servo/Cargo.toml
@@ -19,6 +19,7 @@ energy-profiling = ["profile_traits/energy-profiling"]
 debugmozjs = ["script/debugmozjs"]
 googlevr = ["webvr/googlevr"]
 oculusvr = ["webvr/oculusvr"]
+unstable = ["euclid/unstable", "layout_thread/unstable"]
 
 [dependencies]
 bluetooth_traits = {path = "../bluetooth_traits"}
diff --git a/ports/servo/Cargo.toml b/ports/servo/Cargo.toml
index 80b9c19b831..32e5e8433f6 100644
--- a/ports/servo/Cargo.toml
+++ b/ports/servo/Cargo.toml
@@ -29,13 +29,14 @@ servo_remutex_tests = {path = "../../tests/unit/servo_remutex"}
 style_tests = {path = "../../tests/unit/style"}
 
 [features]
-default = ["webdriver", "max_log_level"]
+default = ["webdriver", "max_log_level", "unstable"]
 max_log_level = ["log/release_max_level_info"]
 webdriver = ["libservo/webdriver_server"]
 energy-profiling = ["libservo/energy-profiling"]
 debugmozjs = ["libservo/debugmozjs"]
 googlevr = ["libservo/googlevr"]
 oculusvr = ["libservo/oculusvr"]
+unstable = ["libservo/unstable"]
 
 [dependencies]
 backtrace = "0.3"