diff --git a/.travis.yml b/.travis.yml
index 4858b1d9b..01b6006c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ jobs:
     - language: rust
       # Run proxy benchmarks in development mode. Requires nightly.
       # Failures are not fatal.
-      rust: nightly
+      rust: nightly-2018-05-26
       cache: cargo
       script:
         - (cd proxy && cargo test --benches --locked --no-default-features)
@@ -143,9 +143,12 @@ jobs:
         - target/cli/linux/conduit install --conduit-version=$CONDUIT_TAG |tee conduit.yml
         - kubectl -n conduit apply -f conduit.yml --prune --selector='conduit.io/control-plane-component'
 
-  allow_failures:
-    - rust: nightly
-  fast_finish: true
+  # If we want to start building everything against bleeding-edge Rust nightly, we'll have
+  # to enable:
+  #
+  # allow_failures:
+  #   - rust: nightly
+  # fast_finish: true
 
 notifications:
   email:
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index fa8cb7c41..cb03b24c4 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -39,8 +39,6 @@ prost-types = "0.3.0"
 
 trust-dns-resolver = { default-features = false, git = "https://github.com/bluejekyll/trust-dns", branch = "master" }
 
-#futures-watch   = { git = "https://github.com/carllerche/better-future" }
-
 tokio-connect         = { git = "https://github.com/carllerche/tokio-connect" }
 tower-service         = { git = "https://github.com/tower-rs/tower" }
 tower-balance         = { git = "https://github.com/tower-rs/tower" }
diff --git a/proxy/benches/record.rs b/proxy/benches/record.rs
index fea9922a0..f8f9a6aab 100644
--- a/proxy/benches/record.rs
+++ b/proxy/benches/record.rs
@@ -2,7 +2,6 @@
 #![deny(warnings)]
 
 extern crate conduit_proxy;
-extern crate futures_watch;
 extern crate http;
 extern crate test;
 
@@ -44,8 +43,7 @@ where
     L: IntoIterator<Item=(S, S)>,
     S: fmt::Display,
 {
-    let (labels_watch, _store) = futures_watch::Watch::new(metrics::DstLabels::new(labels));
-    ctx::transport::Client::new(&proxy, &addr(), Some(labels_watch))
+    ctx::transport::Client::new(&proxy, &addr(), metrics::DstLabels::new(labels))
 }
 
 fn request(