diff --git a/Makefile b/Makefile
index c086953cc4db..0d8f2891e8b6 100644
--- a/Makefile
+++ b/Makefile
@@ -162,12 +162,7 @@ $(if $(filter-out $(words $(required_mixed_files)), \
 	$(error KBUILD_MIXED_TREE=$(KBUILD_MIXED_TREE) doesn't contain $(required_mixed_files)))
 endif
 
-mixed-build-prefix = $(if $(KBUILD_MIXED_TREE),$(KBUILD_MIXED_TREE)/)
 export KBUILD_MIXED_TREE
-# This is a hack for kleaf to set mixed-build-prefix within the execution of a make rule, e.g.
-# within __modinst_pre.
-# TODO(b/205893923): Revert this hack once it is properly handled.
-export mixed-build-prefix
 
 ifeq ("$(origin W)", "command line")
   KBUILD_EXTRA_WARN := $(W)
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 708aa3b855fa..c86367d061c9 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -38,8 +38,6 @@ __modpost:
 include $(objtree)/include/config/auto.conf
 include $(srctree)/scripts/Kbuild.include
 
-mixed-build-prefix = $(if $(KBUILD_MIXED_TREE),$(KBUILD_MIXED_TREE)/)
-
 MODPOST = $(objtree)/scripts/mod/modpost
 
 modpost-args =										\