diff --git a/std/os/wasi.zig b/std/os/wasi.zig
index 458669529cded3676cf3e2fd93b8d7454bdb9083..af51b266d9208fdcea8661acd215fda7fb065ab5 100644
--- a/std/os/wasi.zig
+++ b/std/os/wasi.zig
@@ -1,4 +1,4 @@
-use @import("wasi/core.zig");
+pub use @import("wasi/core.zig");
 
 pub const STDIN_FILENO = 0;
 pub const STDOUT_FILENO = 1;
diff --git a/std/special/bootstrap.zig b/std/special/bootstrap.zig
index e93a85861d5fc3040112b7e1cb84dd1c1f3740a8..520561d54759f0fb99bcab5f5bc3932d865396be 100644
--- a/std/special/bootstrap.zig
+++ b/std/special/bootstrap.zig
@@ -14,14 +14,16 @@ comptime {
         @export("main", main, strong_linkage);
     } else if (builtin.os == builtin.Os.windows) {
         @export("WinMainCRTStartup", WinMainCRTStartup, strong_linkage);
-    } else if (builtin.os == builtin.Os.wasi) {
-        @export("_start", wasiStart, strong_linkage);
     } else {
         @export("_start", _start, strong_linkage);
     }
 }
 
 nakedcc fn _start() noreturn {
+    if (builtin.os == builtin.Os.wasi) {
+        std.os.wasi.__wasi_proc_exit(callMain());
+    }
+
     switch (builtin.arch) {
         builtin.Arch.x86_64 => {
             argc_ptr = asm ("lea (%%rsp), %[argc]"
@@ -45,16 +47,6 @@ nakedcc fn _start() noreturn {
     @noInlineCall(posixCallMainAndExit);
 }
 
-nakedcc fn wasiStart() noreturn {
-    // TODO: Decide if alloc at init is acceptable for args and env
-    // @llvm.wasm.mem.grow.i32
-    // __wasi_args_get()
-    // __wasi_args_sizes_get()
-    // __wasi_environ_get()
-    // __wasi_environ_sizes_get()
-    std.os.posix.exit(callMain());
-}
-
 extern fn WinMainCRTStartup() noreturn {
     @setAlignStack(16);
     if (!builtin.single_threaded) {