diff --git a/pyproject.toml b/pyproject.toml
index 36f1dd90..a7e6620e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -88,11 +88,5 @@ delocate-listdeps {wheel} && delocate-wheel --exclude libtableauhyperapi.dylib -
 """
 
 [tool.cibuildwheel.windows]
-# https://github.com/actions/runner-images/issues/4711
-repair-wheel-command = [
-    "mkdir subdir",
-    "tar -xf {wheel} -C subdir",
-    "cd subdir",
-    "\"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.20348.0\\x86\\mt.exe\" -manifest pantab\\libpantab.manifest -outputresource:pantab\\libpantab.cp39-win_amd64.pyd;2",
-    "python -m wheel pack --dest-dir {dest_dir} .",
-]
+before-build = "pip install delvewheel"
+repair-wheel-command = "delvewheel repair -v -w {dest_dir} {wheel}"
diff --git a/src/pantab/libpantab.manifest b/src/pantab/libpantab.manifest
deleted file mode 100644
index d295f174..00000000
--- a/src/pantab/libpantab.manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <file name="tableauhyperapi.dll" />
-</assembly>
diff --git a/src/pantab/tableauhyperapi.manifest b/src/pantab/tableauhyperapi.manifest
deleted file mode 100644
index 049d7ae2..00000000
--- a/src/pantab/tableauhyperapi.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity
-      type="win32"
-      name="tableauhyperapi"
-      version="4.1.0.0"
-      processorArchitecture="amd64"
-  />
-  <file name="tableauhyperapi.dll"/>
-</assembly>