diff --git a/baystation12.dme b/baystation12.dme
index e845c4db13892..99fd71276cb92 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1257,7 +1257,6 @@
 #include "code\modules\admin\buildmode\areas.dm"
 #include "code\modules\admin\buildmode\atmosphere.dm"
 #include "code\modules\admin\buildmode\build.dm"
-#include "code\modules\admin\buildmode\callproc.dm"
 #include "code\modules\admin\buildmode\copypaste.dm"
 #include "code\modules\admin\buildmode\edit.dm"
 #include "code\modules\admin\buildmode\ladders.dm"
@@ -3237,6 +3236,7 @@
 #include "customs\code\taushai.dm"
 #include "customs\code\vezha.dm"
 #include "customs\code\zakatneba.dm"
+#include "infinity\code\modules\admin\buildmode\callproc.dm"
 #include "interface\interface.dm"
 #include "interface\skin.dmf"
 #include "maps\_maps.dm"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 8e1bab8498efd..f00b55d57ac45 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -583,12 +583,10 @@ var/list/admin_verbs_xeno = list(
 	if(!check_rights(R_ADMIN))
 		return
 
-	if(istype(CH, /datum/click_handler/build_mode))
-		CH.Exit()
-		QDEL_NULL(CH)
+	if(istype(mob.GetClickHandler(), /datum/click_handler/build_mode))
+		mob.RemoveClickHandler(/datum/click_handler/build_mode)
 	else
-		CH = new /datum/click_handler/build_mode(mob)
-		CH.Enter()
+		mob.PushClickHandler(/datum/click_handler/build_mode)
 
 /client/proc/object_talk(var/msg as text) // -- TLE
 	set category = "Special Verbs"
diff --git a/code/modules/admin/buildmode/callproc.dm b/infinity/code/modules/admin/buildmode/callproc.dm
similarity index 100%
rename from code/modules/admin/buildmode/callproc.dm
rename to infinity/code/modules/admin/buildmode/callproc.dm