diff --git a/code/_compile_options.dm b/code/_compile_options.dm
index 0b7d0978fd0..cc524aa9af1 100644
--- a/code/_compile_options.dm
+++ b/code/_compile_options.dm
@@ -55,3 +55,9 @@
 #error Your version of BYOND is too out-of-date to compile this project. Go to secure.byond.com/download and update.
 #error You need version 516.1651 or higher
 #endif
+
+#define MAX_COMPILER_BUILD 1673
+#if(DM_BUILD > MAX_COMPILER_BUILD) && !defined(SPACEMAN_DMM)
+#error Your version of BYOND is too new for the libraries in this project.
+#error Please go to secure.byond.com/download and download 516.1673 or older.
+#endif
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 4b617fc4ffd..0f749536966 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -336,8 +336,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "byondapi"
-version = "0.6.14"
-source = "git+https://github.com/spacestation13/byondapi-rs.git#6726e9a71be954059c438adbf3505f866c10b835"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b8a7097daa6316edba08830dafec10e28f4d844888ca87c1daae5be8e7a535e"
 dependencies = [
  "byondapi-macros",
  "byondapi-sys",
@@ -348,8 +349,9 @@ dependencies = [
 
 [[package]]
 name = "byondapi-macros"
-version = "0.3.3"
-source = "git+https://github.com/spacestation13/byondapi-rs.git#6726e9a71be954059c438adbf3505f866c10b835"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7aaf3e0a7599499e6eb30b729cf72374e3638cf110e7e652a9b416bd4c7bbcc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -359,7 +361,8 @@ dependencies = [
 [[package]]
 name = "byondapi-sys"
 version = "0.12.3"
-source = "git+https://github.com/spacestation13/byondapi-rs.git#6726e9a71be954059c438adbf3505f866c10b835"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fcca4fc87785dbf0365f66bfcbca2f84b94360ae14c0c36d5879f4e8b56baf7"
 dependencies = [
  "bindgen",
  "doxygen-rs",
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 8dcec11bdef..5beb0be431c 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -11,13 +11,13 @@ crate-type = ["cdylib"]
 [dependencies]
 atomic_float = "1.0.0"
 bitflags = "2.5.0"
-byondapi = { git = "https://github.com/spacestation13/byondapi-rs.git", version = "0.6.14" }
+byondapi = "0.5.14"
 eyre = "0.6.12"
 rand = { version = "0.8.6", features = ["small_rng"] }
 scc = "2.1.1"
 thread-priority = "1.1.0"
 
-# spacemandmm, also used by strongmandmm
+# spacemandmm, used by mapmanip
 dmmtools = { git = "https://github.com/SpaceManiac/SpacemanDMM", rev = "6c5a751516ae0e8add4b2aa4388a1e84e96e7082", package = "dmm-tools" }
 dreammaker = { git = "https://github.com/SpaceManiac/SpacemanDMM", rev = "6c5a751516ae0e8add4b2aa4388a1e84e96e7082", package = "dreammaker" }
 # diffs between two strings/texts/files, used in tests
diff --git a/rustlibs.dll b/rustlibs.dll
index 9b6bf9f8076..41008c2786d 100644
Binary files a/rustlibs.dll and b/rustlibs.dll differ
diff --git a/rustlibs_prod.dll b/rustlibs_prod.dll
index 2f647607d1d..a31983b3c17 100644
Binary files a/rustlibs_prod.dll and b/rustlibs_prod.dll differ
diff --git a/tools/ci/librustlibs_ci.so b/tools/ci/librustlibs_ci.so
index 3e8c161f22a..1d8feda2089 100644
Binary files a/tools/ci/librustlibs_ci.so and b/tools/ci/librustlibs_ci.so differ