diff --git a/CHANGES.md b/CHANGES.md
index ce8ffd619..ab9caa7bd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,7 @@
 # Changes
 
 
-## [2.1.NEXT] - 2020-01-xx
+## [2.0.NEXT] - 2020-01-xx
 
 ### Added
 
@@ -15,8 +15,6 @@
 
 * Update the `time` dependency to 0.2.7
 
-* Accomodate breaking change in actix-http: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
-
 ## [2.0.0] - 2019-12-25
 
 ### Changed
diff --git a/Cargo.toml b/Cargo.toml
index b9b647568..5ba358e2c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-web"
-version = "3.0.0"
+version = "2.0.0"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
 readme = "README.md"
diff --git a/actix-identity/Cargo.toml b/actix-identity/Cargo.toml
index 47c792657..910aef48e 100644
--- a/actix-identity/Cargo.toml
+++ b/actix-identity/Cargo.toml
@@ -16,7 +16,7 @@ name = "actix_identity"
 path = "src/lib.rs"
 
 [dependencies]
-actix-web = { version = "3.0.0", path = "..", default-features = false, features = ["secure-cookies"] }
+actix-web = { version = "2.0.0", default-features = false, features = ["secure-cookies"] }
 actix-service = "1.0.5"
 futures = "0.3.1"
 serde = "1.0"
@@ -25,5 +25,5 @@ time = { version = "0.2.5", default-features = false, features = ["std"] }
 
 [dev-dependencies]
 actix-rt = "1.0.0"
-actix-http = { version = "2.0.0", path = "../actix-http" }
+actix-http = { version = "1.0.1" }
 bytes = "0.5.4"
diff --git a/actix-session/Cargo.toml b/actix-session/Cargo.toml
index d886a5d8e..b0a89ee29 100644
--- a/actix-session/Cargo.toml
+++ b/actix-session/Cargo.toml
@@ -22,7 +22,7 @@ default = ["cookie-session"]
 cookie-session = ["actix-web/secure-cookies"]
 
 [dependencies]
-actix-web = { version = "3.0.0", path = ".." }
+actix-web = { version = "2.0.0" }
 actix-service = "1.0.5"
 bytes = "0.5.4"
 derive_more = "0.99.2"
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index 917549d09..d410ae514 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -4,8 +4,6 @@
 
 * Fix compilation with default features off
 
-* Accomodate breaking change: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
-
 ## [1.0.0] - 2019-12-13
 
 * Release
diff --git a/src/test.rs b/src/test.rs
index 957e66638..6a6ef27c5 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -1163,6 +1163,10 @@ mod tests {
     }
 
 /*
+
+    Comment out until actix decoupled of actix-http:
+    https://github.com/actix/actix/issues/321
+
     use futures::FutureExt;
 
     #[actix_rt::test]
diff --git a/test-server/CHANGES.md b/test-server/CHANGES.md
index d262d219c..96c010355 100644
--- a/test-server/CHANGES.md
+++ b/test-server/CHANGES.md
@@ -4,9 +4,6 @@
 
 * Update the `time` dependency to 0.2.7
 
-* Breaking change: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()
-
-
 ## [1.0.0] - 2019-12-13
 
 ### Changed
diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml
index 51c25f8d1..f4ec1e238 100644
--- a/test-server/Cargo.toml
+++ b/test-server/Cargo.toml
@@ -55,5 +55,5 @@ time = { version = "0.2.7", default-features = false, features = ["std"] }
 open-ssl = { version="0.10", package="openssl", optional = true }
 
 [dev-dependencies]
-actix-web = { version = "3.0.0", path = ".." }
-actix-http = { version = "2.0.0", path = "../actix-http" }
+actix-web = { version = "2.0.0" }
+actix-http = { version = "1.0.1" }
diff --git a/tests/test_weird_poll.rs b/tests/test_weird_poll.rs
index 768dda1c8..571b69f45 100644
--- a/tests/test_weird_poll.rs
+++ b/tests/test_weird_poll.rs
@@ -27,4 +27,4 @@ fn weird_poll() {
     let _ = std::mem::replace(&mut body_stream, Err([0; 32])).unwrap().poll_next(&mut context);
 }
 
-*/
\ No newline at end of file
+*/