--- libmalloc/libmalloc-521.120.7/tests/malloc_claimed_address_tests.c
+++ libmalloc/libmalloc-166.251.2/tests/malloc_claimed_address_tests.c
@@ -10,18 +10,13 @@
 #include <stdio.h>
 #include <mach/mach.h>
 #include <mach/mach_vm.h>
+#include <malloc.h>
 #include <malloc/malloc.h>
 #include <malloc_private.h>
 #include <sys/mman.h>
-#include "base.h"
-
-T_GLOBAL_META(T_META_RUN_CONCURRENTLY(true));
 
 T_DECL(malloc_claimed_address_default_zone_test,
 		"Tests for malloc_claimed_address, default zone only",
-#if TARGET_OS_IPHONE
-		T_META_TAG_XZONE,
-#endif // TARGET_OS_IPHONE
 		T_META_ENVVAR("MallocNanoZone=0"))
 {
 	// NULL is never a possible pointer.
@@ -70,9 +65,6 @@
 
 T_DECL(malloc_zone_claimed_address_test,
 		"Tests for malloc_zone_claimed_address",
-#if TARGET_OS_IPHONE
-		T_META_TAG_XZONE,
-#endif // TARGET_OS_IPHONE
 		T_META_ENVVAR("MallocNanoZone=0"))
 {
 	malloc_zone_t *zone = malloc_create_zone(0, 0);
@@ -148,9 +140,6 @@
 
 T_DECL(malloc_claimed_address_zone_test,
 		"Tests for malloc_claimed_address with another zone",
-#if TARGET_OS_IPHONE
-		T_META_TAG_XZONE,
-#endif // TARGET_OS_IPHONE
 		T_META_ENVVAR("MallocNanoZone=0"))
 {
 	// Allocate in a custom zone, check that we can still use
@@ -209,16 +198,6 @@
 		free(ptr);
 	}
 
-	// Allocate a non-Nano size, which Nano will pass to its helper zone.
-	// Verify that it still claims the address as valid when asked via the
-	// default zone.
-	void *ptr = malloc(512);
-	result = malloc_claimed_address(ptr);
-	T_EXPECT_TRUE(result, "Above nano pointer check");
-	result = malloc_zone_claimed_address(malloc_default_zone(), ptr);
-	T_EXPECT_TRUE(result, "Above nano pointer check via default zone");
-	free(ptr);
-
 	// Allocate some memory with vm_allocate() and make sure it's not claimed.
 	mach_vm_address_t addr;
 	kern_return_t kr = mach_vm_allocate(mach_task_self(), &addr, 1024, VM_FLAGS_ANYWHERE);
@@ -231,9 +210,6 @@
 
 T_DECL(malloc_claimed_address_custom_zone_test,
 		"Tests for malloc_claimed_address in a zone that does not implement it",
-#if TARGET_OS_IPHONE
-		T_META_TAG_XZONE,
-#endif // TARGET_OS_IPHONE
 		T_META_ENVVAR("MallocNanoZone=0"))
 {
 	// Custom zones that do not support claimed_address must always appear
@@ -281,18 +257,3 @@
 	malloc_destroy_zone(zone);
 }
 
-#if TARGET_OS_IPHONE
-T_DECL(malloc_claimed_address_xzone_test,
-		"Specific xzone malloc tests for malloc_claimed_address",
-		T_META_TAG_XZONE_ONLY,
-		T_META_ENVVAR("MallocProbGuard=0"))
-{
-	// Allocate a HUGE buffer, and then check that both the start and end of it
-	// are claimed by malloc
-	void *ptr = malloc(MiB(6));
-	T_EXPECT_TRUE(malloc_claimed_address(ptr), "start of HUGE allocation");
-	T_EXPECT_TRUE(malloc_claimed_address(ptr + MiB(6) - 1),
-			"end of HUGE allocation");
-	free(ptr);
-}
-#endif // TARGET_OS_IPHONE