--- libmalloc/libmalloc-646.40.3/src/magazine_malloc.c
+++ libmalloc/libmalloc-521.100.59/src/magazine_malloc.c
@@ -316,12 +316,6 @@
 	return szone_malloc_should_clear(szone, size, 0);
 }
 
-static void *
-szone_malloc_type_malloc(szone_t *szone, size_t size, malloc_type_id_t type_id)
-{
-	return szone_malloc(szone, size);
-}
-
 void *
 szone_calloc(szone_t *szone, size_t num_items, size_t size)
 {
@@ -330,13 +324,6 @@
 		return NULL;
 	}
 	return szone_malloc_should_clear(szone, total_bytes, 1);
-}
-
-static void *
-szone_malloc_type_calloc(szone_t *szone, size_t num_items, size_t size,
-		malloc_type_id_t type_id)
-{
-	return szone_calloc(szone, num_items, size);
 }
 
 void *
@@ -605,13 +592,6 @@
 	return new_ptr;
 }
 
-static void *
-szone_malloc_type_realloc(szone_t *szone, void *ptr, size_t size,
-		malloc_type_id_t type_id)
-{
-	return szone_realloc(szone, ptr, size);
-}
-
 void *
 szone_memalign(szone_t *szone, size_t alignment, size_t size)
 {
@@ -676,13 +656,6 @@
 	}
 	/* NOTREACHED */
 	__builtin_unreachable();
-}
-
-static void *
-szone_malloc_type_memalign(szone_t *szone, size_t align, size_t size,
-		malloc_type_id_t type_id)
-{
-	return szone_memalign(szone, align, size);
 }
 
 // Given a size, returns the number of pointers allocated capable of holding
@@ -1320,9 +1293,15 @@
 static MALLOC_INLINE void
 szone_force_lock_magazine(szone_t *szone, magazine_t *mag)
 {
-	// Acquire the alloc lock first to avoid deadlocking with allocating threads
-	_malloc_lock_lock(&mag->magazine_alloc_lock);
-	SZONE_MAGAZINE_PTR_LOCK(mag);
+	while (1) {
+		SZONE_MAGAZINE_PTR_LOCK(mag);
+		if (!mag->alloc_underway) {
+			return;
+		}
+
+		SZONE_MAGAZINE_PTR_UNLOCK(mag);
+		yield();
+	}
 }
 
 static void
@@ -1363,19 +1342,16 @@
 	if (szone->is_medium_engaged) {
 		for (i = -1; i < szone->medium_rack.num_magazines; ++i) {
 			SZONE_MAGAZINE_PTR_UNLOCK((&(szone->medium_rack.magazines[i])));
-			_malloc_lock_unlock(&szone->medium_rack.magazines[i].magazine_alloc_lock);
 		}
 	}
 #endif // CONFIG_MEDIUM_ALLOCATOR
 
 	for (i = -1; i < szone->small_rack.num_magazines; ++i) {
 		SZONE_MAGAZINE_PTR_UNLOCK((&(szone->small_rack.magazines[i])));
-		_malloc_lock_unlock(&szone->small_rack.magazines[i].magazine_alloc_lock);
 	}
 
 	for (i = -1; i < szone->tiny_rack.num_magazines; ++i) {
 		SZONE_MAGAZINE_PTR_UNLOCK((&(szone->tiny_rack.magazines[i])));
-		_malloc_lock_unlock(&szone->tiny_rack.magazines[i].magazine_alloc_lock);
 	}
 }
 
@@ -1390,19 +1366,16 @@
 	if (szone->is_medium_engaged) {
 		for (i = -1; i < szone->medium_rack.num_magazines; ++i) {
 			SZONE_MAGAZINE_PTR_REINIT_LOCK((&(szone->medium_rack.magazines[i])));
-			_malloc_lock_init(&szone->medium_rack.magazines[i].magazine_alloc_lock);
 		}
 	}
 #endif // CONFIG_MEDIUM_ALLOCATOR
 
 	for (i = -1; i < szone->small_rack.num_magazines; ++i) {
 		SZONE_MAGAZINE_PTR_REINIT_LOCK((&(szone->small_rack.magazines[i])));
-		_malloc_lock_init(&szone->small_rack.magazines[i].magazine_alloc_lock);
 	}
 
 	for (i = -1; i < szone->tiny_rack.num_magazines; ++i) {
 		SZONE_MAGAZINE_PTR_REINIT_LOCK((&(szone->tiny_rack.magazines[i])));
-		_malloc_lock_init(&szone->tiny_rack.magazines[i].magazine_alloc_lock);
 	}
 }
 
@@ -1426,11 +1399,6 @@
 					return 1;
 				}
 				SZONE_MAGAZINE_PTR_UNLOCK((&(szone->small_rack.magazines[i])));
-				tookLock = _malloc_lock_trylock(&szone->medium_rack.magazines[i].magazine_alloc_lock);
-				if (tookLock == 0) {
-					return 1;
-				}
-				_malloc_lock_unlock(&szone->medium_rack.magazines[i].magazine_alloc_lock);
 		}
 	}
 #endif // CONFIG_MEDIUM_ALLOCATOR
@@ -1441,11 +1409,6 @@
 			return 1;
 		}
 		SZONE_MAGAZINE_PTR_UNLOCK((&(szone->small_rack.magazines[i])));
-		tookLock = _malloc_lock_trylock(&szone->small_rack.magazines[i].magazine_alloc_lock);
-		if (tookLock == 0) {
-			return 1;
-		}
-		_malloc_lock_unlock(&szone->small_rack.magazines[i].magazine_alloc_lock);
 	}
 
 	for (i = -1; i < szone->tiny_rack.num_magazines; ++i) {
@@ -1454,11 +1417,6 @@
 			return 1;
 		}
 		SZONE_MAGAZINE_PTR_UNLOCK((&(szone->tiny_rack.magazines[i])));
-		tookLock = _malloc_lock_trylock(&szone->tiny_rack.magazines[i].magazine_alloc_lock);
-		if (tookLock == 0) {
-			return 1;
-		}
-		_malloc_lock_unlock(&szone->tiny_rack.magazines[i].magazine_alloc_lock);
 	}
 	return 0;
 }
@@ -1778,7 +1736,7 @@
 	// Initialize the security token.
 	szone->cookie = (uintptr_t)malloc_entropy[0];
 
-	szone->basic_zone.version = 16;
+	szone->basic_zone.version = 13;
 	szone->basic_zone.size = (void *)szone_size;
 	szone->basic_zone.malloc = (void *)szone_malloc;
 	szone->basic_zone.calloc = (void *)szone_calloc;
@@ -1795,11 +1753,6 @@
 	szone->basic_zone.claimed_address = (void *)szone_claimed_address;
 	szone->basic_zone.try_free_default = (void *)szone_try_free_default;
 
-	szone->basic_zone.malloc_type_malloc = (void *)szone_malloc_type_malloc;
-	szone->basic_zone.malloc_type_calloc = (void *)szone_malloc_type_calloc;
-	szone->basic_zone.malloc_type_realloc = (void *)szone_malloc_type_realloc;
-	szone->basic_zone.malloc_type_memalign = (void *)szone_malloc_type_memalign;
-
 	/* Set to zero once and for all as required by CFAllocator. */
 	szone->basic_zone.reserved1 = 0;
 	/* Set to zero once and for all as required by CFAllocator. */