diff --git a/Cargo.lock b/Cargo.lock
index fbc8d8a6..61b7d4bc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3,7 +3,7 @@
 [[package]]
 name = "abscissa_core"
 version = "0.5.2"
-source = "git+https://github.com/yaahc/abscissa.git?branch=develop#41d342a9344e38442b2211b07f28a89505892a21"
+source = "git+https://github.com/yaahc/abscissa.git?rev=41d342a9344e38442b2211b07f28a89505892a21#41d342a9344e38442b2211b07f28a89505892a21"
 dependencies = [
  "abscissa_derive",
  "backtrace",
@@ -30,7 +30,7 @@ dependencies = [
 [[package]]
 name = "abscissa_derive"
 version = "0.5.0"
-source = "git+https://github.com/yaahc/abscissa.git?branch=develop#41d342a9344e38442b2211b07f28a89505892a21"
+source = "git+https://github.com/yaahc/abscissa.git?rev=41d342a9344e38442b2211b07f28a89505892a21#41d342a9344e38442b2211b07f28a89505892a21"
 dependencies = [
  "darling",
  "ident_case",
@@ -290,26 +290,13 @@ dependencies = [
 [[package]]
 name = "color-eyre"
 version = "0.5.0"
-source = "git+https://github.com/yaahc/color-eyre.git?branch=hooked#f882a88a7037aa621a42c3719d06a2286aa0f8de"
+source = "git+https://github.com/yaahc/color-eyre.git?rev=f882a88a7037aa621a42c3719d06a2286aa0f8de#f882a88a7037aa621a42c3719d06a2286aa0f8de"
 dependencies = [
  "ansi_term",
  "backtrace",
- "color-spantrace",
  "eyre",
  "indenter",
  "once_cell",
- "tracing-error",
-]
-
-[[package]]
-name = "color-spantrace"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058b1bb1ea9b128049d3aa4cfbf166c6c8e53f3eade5f40ebb2d2a51cef65058"
-dependencies = [
- "ansi_term",
- "tracing-core",
- "tracing-error",
 ]
 
 [[package]]
@@ -1737,7 +1724,7 @@ dependencies = [
 [[package]]
 name = "spandoc"
 version = "0.1.3"
-source = "git+https://github.com/yaahc/spandoc.git#554358be632b156a6f0af963b0b244e2665b4767"
+source = "git+https://github.com/yaahc/spandoc.git?rev=554358be632b156a6f0af963b0b244e2665b4767#554358be632b156a6f0af963b0b244e2665b4767"
 dependencies = [
  "matches",
  "proc-macro2 1.0.18",
diff --git a/Cargo.toml b/Cargo.toml
index b3481e42..3492f214 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,4 +19,6 @@ panic = "abort"
 panic = "abort"
 
 [patch.crates-io]
-abscissa_core = { git = "https://github.com/yaahc/abscissa.git", branch = "develop" }
+abscissa_core = { git = "https://github.com/yaahc/abscissa.git", rev = "41d342a9344e38442b2211b07f28a89505892a21" }
+color-eyre = { git = "https://github.com/yaahc/color-eyre.git", rev = "f882a88a7037aa621a42c3719d06a2286aa0f8de", features = ["capture-spantrace"] }
+spandoc = { git = "https://github.com/yaahc/spandoc.git", rev = "554358be632b156a6f0af963b0b244e2665b4767" }
\ No newline at end of file
diff --git a/tower-batch/Cargo.toml b/tower-batch/Cargo.toml
index 13e6dfaf..b274b3a9 100644
--- a/tower-batch/Cargo.toml
+++ b/tower-batch/Cargo.toml
@@ -21,4 +21,4 @@ tokio = { version = "0.2", features = ["full"]}
 tracing-error = "0.1.2"
 tracing-subscriber = "0.2.6"
 tracing = "0.1.15"
-color-eyre = { git = "https://github.com/yaahc/color-eyre.git", branch = "hooked", features = ["capture-spantrace"] }
+color-eyre = "0.5"
diff --git a/zebra-consensus/Cargo.toml b/zebra-consensus/Cargo.toml
index ccdb7b8b..681d4c48 100644
--- a/zebra-consensus/Cargo.toml
+++ b/zebra-consensus/Cargo.toml
@@ -15,9 +15,9 @@ tower = "0.3.1"
 
 [dev-dependencies]
 zebra-test = { path = "../zebra-test/" }
-spandoc = { git = "https://github.com/yaahc/spandoc.git" }
+spandoc = "0.1"
 tokio = { version = "0.2.21", features = ["full"] }
 tracing = "0.1.15"
 tracing-error = "0.1.2"
 tracing-subscriber = "0.2.6"
-color-eyre = { git = "https://github.com/yaahc/color-eyre.git", branch = "hooked", features = ["capture-spantrace"] }
+color-eyre = "0.5"
diff --git a/zebra-consensus/src/checkpoint.rs b/zebra-consensus/src/checkpoint.rs
index f21a4fa7..b4a6352e 100644
--- a/zebra-consensus/src/checkpoint.rs
+++ b/zebra-consensus/src/checkpoint.rs
@@ -156,8 +156,7 @@ where
 mod tests {
     use super::*;
 
-    use color_eyre::Report;
-    use eyre::{bail, ensure, eyre};
+    use color_eyre::eyre::{bail, ensure, eyre, Report};
     use tower::{util::ServiceExt, Service};
 
     use zebra_chain::serialization::ZcashDeserialize;
diff --git a/zebra-state/Cargo.toml b/zebra-state/Cargo.toml
index 41af166e..35af8f3e 100644
--- a/zebra-state/Cargo.toml
+++ b/zebra-state/Cargo.toml
@@ -19,10 +19,10 @@ serde = { version = "1", features = ["serde_derive"] }
 [dev-dependencies]
 tokio = { version = "0.2.21", features = ["full"] }
 zebra-test = { path = "../zebra-test" }
-spandoc = { git = "https://github.com/yaahc/spandoc.git" }
+spandoc = "0.1"
 tracing = "0.1.15"
 tracing-futures = "0.2.4"
 tracing-error = "0.1.2"
 tracing-subscriber = "0.2.6"
 tempdir = "0.3.7"
-color-eyre = { git = "https://github.com/yaahc/color-eyre.git", branch = "hooked", features = ["capture-spantrace"] }
+color-eyre = "0.5"
diff --git a/zebrad/Cargo.toml b/zebrad/Cargo.toml
index 70392371..af65fbec 100644
--- a/zebrad/Cargo.toml
+++ b/zebrad/Cargo.toml
@@ -33,7 +33,7 @@ zebra-network = { path = "../zebra-network" }
 zebra-state = { path = "../zebra-state" }
 tracing-subscriber = { version = "0.2.6", features = ["tracing-log"] }
 tracing-error = "0.1.2"
-color-eyre = { git = "https://github.com/yaahc/color-eyre.git", branch = "hooked", features = ["capture-spantrace"] }
+color-eyre = "0.5"
 
 [dev-dependencies]
 abscissa_core = { version = "0.5", features = ["testing"] }