diff --git a/Cargo.toml b/Cargo.toml
index 94018ebdd3..45bfa332b8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -25,7 +25,7 @@ wasmtime-obj = { path = "wasmtime-obj" }
 wasmtime-wast = { path = "wasmtime-wast" }
 wasmtime-wasi = { path = "wasmtime-wasi" }
 wasmtime-wasi-c = { path = "wasmtime-wasi-c", optional = true }
-wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"}
+wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 faerie = "0.11.0"
diff --git a/wasmtime-api/Cargo.toml b/wasmtime-api/Cargo.toml
index aebd3c2f3c..56a85ee9b3 100644
--- a/wasmtime-api/Cargo.toml
+++ b/wasmtime-api/Cargo.toml
@@ -35,7 +35,7 @@ core = ["hashbrown/nightly", "cranelift-codegen/core", "cranelift-wasm/core", "w
 
 [dev-dependencies]
 # for wasmtime.rs
-wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"}
+wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
 docopt = "1.0.1"
 serde = { "version" = "1.0.94", features = ["derive"] }
 pretty_env_logger = "0.3.0"
diff --git a/wasmtime-wasi/Cargo.toml b/wasmtime-wasi/Cargo.toml
index 3523a17f16..c9c0f71be2 100644
--- a/wasmtime-wasi/Cargo.toml
+++ b/wasmtime-wasi/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 wasmtime-runtime = { path = "../wasmtime-runtime" }
 wasmtime-environ = { path = "../wasmtime-environ" }
 wasmtime-jit = { path = "../wasmtime-jit" }
-wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3bf040"}
+wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "3a374d0"}
 cranelift-codegen = { version = "0.46.1", features = ["enable-serde"] }
 cranelift-entity = { version = "0.46.1", features = ["enable-serde"] }
 cranelift-wasm = { version = "0.46.1", features = ["enable-serde"] }
diff --git a/wasmtime-wasi/src/syscalls.rs b/wasmtime-wasi/src/syscalls.rs
index 0ec69904b2..6f4b48a3ae 100644
--- a/wasmtime-wasi/src/syscalls.rs
+++ b/wasmtime-wasi/src/syscalls.rs
@@ -874,8 +874,9 @@ syscalls! {
             nsubscriptions,
             nevents,
         );
+        let wasi_ctx = ok_or_errno!(get_wasi_ctx(&mut *vmctx));
         let memory = ok_or_errno!(get_memory(&mut *vmctx));
-        hostcalls::poll_oneoff(memory, in_, out, nsubscriptions, nevents)
+        hostcalls::poll_oneoff(wasi_ctx, memory, in_, out, nsubscriptions, nevents)
     }
 
     pub unsafe extern "C" fn proc_exit(_vmctx: *mut VMContext, rval: u32,) -> () {