diff --git a/Cargo.toml b/Cargo.toml
index 4ccd7354..8ebb12a3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ exclude = [
 edition = "2021"
 
 [features]
-use_tokio = ["tokio", "tokio-util", "parity-tokio-ipc"]
+use_tokio = ["tokio", "tokio-util"]
 use_async-std = ["async-std"]
 use_neovim_lib = ["neovim-lib"]
 
@@ -37,14 +37,10 @@ rmpv = "1.0.1"
 log = "0.4.20"
 async-trait = "0.1.77"
 futures = { version = "0.3.30", features = ["io-compat"] }
-tokio = { version = "1.36.0", features = ["full"] , optional = true}
+tokio = { version = "1.36.0", features = ["full", "net"] , optional = true}
 tokio-util = { version = "0.7.10", features = ["compat"], optional = true }
 async-std = { version = "1.12.0", features = ["attributes"], optional = true }
 neovim-lib = { version = "0.6.1", optional = true }
-parity-tokio-ipc = { version = "0.9.0", optional = true }
-
-[target.'cfg(windows)'.dependencies]
-winapi = { version = '0.3.9', features = ["winerror"] }
 
 [dev-dependencies]
 tempfile = "3.9.0"
diff --git a/src/create/tokio.rs b/src/create/tokio.rs
index 339454c3..ff2a5494 100644
--- a/src/create/tokio.rs
+++ b/src/create/tokio.rs
@@ -16,7 +16,10 @@ use tokio::{
   task::JoinHandle,
 };
 
-use parity_tokio_ipc::{Connection, Endpoint};
+#[cfg(unix)]
+type Connection = tokio::net::UnixStream;
+#[cfg(windows)]
+type Connection = tokio::net::windows::named_pipe::NamedPipeClient;
 
 use tokio_util::compat::{
   Compat, TokioAsyncReadCompatExt, TokioAsyncWriteCompatExt,
@@ -78,7 +81,38 @@ pub async fn new_path<H, P: AsRef<Path> + Clone>(
 where
   H: Handler<Writer = Compat<WriteHalf<Connection>>> + Send + 'static,
 {
-  let stream = Endpoint::connect(path).await?;
+  let stream = {
+    #[cfg(unix)]
+    {
+      use tokio::net::UnixStream;
+
+      UnixStream::connect(path).await?
+    }
+    #[cfg(windows)]
+    {
+      use std::time::Duration;
+      use tokio::net::windows::named_pipe::ClientOptions;
+      use tokio::time;
+
+      // From windows-sys so we don't have to depend on that for just this constant
+      // https://docs.rs/windows-sys/latest/windows_sys/Win32/Foundation/constant.ERROR_PIPE_BUSY.html
+      pub const ERROR_PIPE_BUSY: i32 = 231i32;
+
+      // Based on the example in the tokio docs, see explanation there
+      // https://docs.rs/tokio/latest/tokio/net/windows/named_pipe/struct.NamedPipeClient.html
+      let client = loop {
+        match ClientOptions::new().open(path.as_ref()) {
+          Ok(client) => break client,
+          Err(e) if e.raw_os_error() == Some(ERROR_PIPE_BUSY) => (),
+          Err(e) => return Err(e),
+        }
+
+        time::sleep(Duration::from_millis(50)).await;
+      };
+
+      client
+    }
+  };
   let (reader, writer) = split(stream);
   let (neovim, io) = Neovim::<Compat<WriteHalf<Connection>>>::new(
     reader.compat(),