--- libmalloc/libmalloc-657.80.3/tests/Makefile
+++ libmalloc/libmalloc-646.40.3/tests/Makefile
@@ -32,7 +32,6 @@
 OTHER_CFLAGS += \
 	-DDARWINTEST \
 	-DOS_ATOMIC_CONFIG_MEMORY_ORDER_DEPENDENCY=1 \
-	-DT_META_TAG_XZONE_AND_PGM=T_META_TAG\(\"xzone_and_pgm\"\) \
 	-DT_META_TAG_XZONE=T_META_TAG\(\"xzone\"\) \
 	-DT_META_TAG_XZONE_ONLY=T_META_TAG\(\"xzone_only\"\) \
 	-DT_META_TAG_NANO_ON_XZONE=T_META_TAG\(\"nano_on_xzone\"\) \
@@ -52,14 +51,7 @@
 OTHER_LDFLAGS += -L $(SDKROOT)/System/ExclaveKit/usr/local/lib
 OTHER_LDFLAGS += -lc++
 
-# FIXME: This should be inherited from SDKSettings.json, but Xcode doesn't
-# invoke the darwintests target once for each variant in BUILD_VARIANTS
-_OTHER_CFLAGS_asan := $(shell plutil -extract DefaultProperties._OTHER_CFLAGS_asan raw -expect string $(SDKROOT)/SDKSettings.json)
-# rdar://128967612 (Don't link compiler-rt for exclavekit sanitizers)
-_OTHER_LDFLAGS_asan := \
-	-fno-sanitize-link-runtime
-
-CUSTOM_TARGETS += libmalloc-exclavekit-darwintests libmalloc-exclavekit-darwintests_asan
+CUSTOM_TARGETS += libmalloc-exclavekit-darwintests
 CUSTOM_TARGETS += libmalloc_exclavekit.plist
 endif
 
@@ -87,13 +79,7 @@
 	-lvas-core \
 	-lxrt
 
-# FIXME: This should be inherited from SDKSettings.json, but Xcode doesn't
-# invoke the darwintests target once for each variant in BUILD_VARIANTS
-_OTHER_CFLAGS_asan := $(shell plutil -extract DefaultProperties._OTHER_CFLAGS_asan raw -expect string $(SDKROOT)/SDKSettings.json)
-_OTHER_LDFLAGS_asan := \
-	-Wl,-image_suffix,_asan
-
-CUSTOM_TARGETS += libmalloc-exclavecore-darwintests libmalloc-exclavecore-darwintests_asan
+CUSTOM_TARGETS += libmalloc-exclavecore-darwintests
 CUSTOM_TARGETS += libmalloc_exclavecore.plist
 endif
 
@@ -289,16 +275,8 @@
 include $(DEVELOPER_DIR)/AppleInternal/Makefiles/darwintest/Makefile.targets
 
 ifeq ($(MALLOC_EXCLAVEKIT),YES)
-# Linker arguments for ASAN must be prepended to select correct libraries
-libmalloc-exclavekit-darwintests_asan: OTHER_CFLAGS += $(_OTHER_CFLAGS_asan)
-libmalloc-exclavekit-darwintests_asan: OTHER_LDFLAGS := $(_OTHER_LDFLAGS_asan) $(OTHER_LDFLAGS)
-libmalloc-exclavekit-darwintests_asan: $(SOURCES_c) $(SYMROOT)/malloc_type_cpp.o
-	$(CC) $(DT_CFLAGS) $(OTHER_CFLAGS) $(CFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) $(LDFLAGS) $^ -o $(SYMROOT)/$@
 libmalloc-exclavekit-darwintests: $(SOURCES_c) $(SYMROOT)/malloc_type_cpp.o
 	$(CC) $(DT_CFLAGS) $(OTHER_CFLAGS) $(CFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) $(LDFLAGS) $^ -o $(SYMROOT)/$@
-install-libmalloc-exclavekit-darwintests_asan: libmalloc-exclavekit-darwintests_asan
-	mkdir -p $(INSTALLDIR)
-	cp $(SYMROOT)/$(patsubst install-%,%,$@) $(INSTALLDIR)/
 install-libmalloc-exclavekit-darwintests: libmalloc-exclavekit-darwintests
 	mkdir -p $(INSTALLDIR)
 	cp $(SYMROOT)/$(patsubst install-%,%,$@) $(INSTALLDIR)/
@@ -310,17 +288,9 @@
 endif
 
 ifeq ($(MALLOC_EXCLAVECORE),YES)
-# Linker arguments for ASAN must be prepended to select correct libraries
-libmalloc-exclavecore-darwintests_asan: OTHER_CFLAGS += $(_OTHER_CFLAGS_asan)
-libmalloc-exclavecore-darwintests_asan: OTHER_LDFLAGS := $(_OTHER_LDFLAGS_asan) $(OTHER_LDFLAGS)
-libmalloc-exclavecore-darwintests_asan: $(SOURCES_c) exclavecore_support.c $(SYMROOT)/malloc_type_cpp.o
-	$(CC) $(DT_CFLAGS) $(OTHER_CFLAGS) $(CFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) $(LDFLAGS) $^ -o $(SYMROOT)/$@
 libmalloc-exclavecore-darwintests: $(SOURCES_c) exclavecore_support.c $(SYMROOT)/malloc_type_cpp.o
 	$(CC) $(DT_CFLAGS) $(OTHER_CFLAGS) $(CFLAGS) $(DT_LDFLAGS) $(OTHER_LDFLAGS) $(LDFLAGS) $^ -o $(SYMROOT)/$@
-install-libmalloc-exclavecore-darwintests_asan: libmalloc-exclavecore-darwintests_asan
-	mkdir -p $(INSTALLDIR)
-	cp $(SYMROOT)/$(patsubst install-%,%,$@) $(INSTALLDIR)/
-install-libmalloc-exclavecore-darwintests: libmalloc-exclavecore-darwintests
+install-libmalloc-exclavecore-darwintests : libmalloc-exclavecore-darwintests
 	mkdir -p $(INSTALLDIR)
 	cp $(SYMROOT)/$(patsubst install-%,%,$@) $(INSTALLDIR)/
 libmalloc_exclavecore.plist: $(PROJECT_DIR)/tests/exclave/libmalloc_exclavecore.plist