diff --git a/Source/NSLock.m b/Source/NSLock.m
index 65526ee48..186273064 100644
--- a/Source/NSLock.m
+++ b/Source/NSLock.m
@@ -43,6 +43,8 @@
 
 #import "GSPThread.h"
 
+#define class_createInstance(C,E) NSAllocateObject(C,E,NSDefaultMallocZone())
+
 static Class    baseConditionClass = Nil;
 static Class    baseConditionLockClass = Nil;
 static Class    baseLockClass = Nil;
@@ -278,14 +280,11 @@ NSString *NSLockException = @"NSLockException";
 
 + (id) allocWithZone: (NSZone*)z
 {
-  return [super allocWithZone: z];
-/*
   if (self == baseLockClass && YES == traceLocks)
     {
       return class_createInstance(tracedLockClass, 0);
     }
   return class_createInstance(self, 0);
-*/
 }
 
 + (void) initialize
@@ -391,14 +390,11 @@ MUNLOCK
 
 + (id) allocWithZone: (NSZone*)z
 {
-  return [super allocWithZone: z];
-/*
   if (self == baseRecursiveLockClass && YES == traceLocks)
     {
       return class_createInstance(tracedRecursiveLockClass, 0);
     }
   return class_createInstance(self, 0);
-*/
 }
 
 + (void) initialize
@@ -435,14 +431,11 @@ MUNLOCK
 
 + (id) allocWithZone: (NSZone*)z
 {
-  return [super allocWithZone: z];
-/*
   if (self == baseConditionClass && YES == traceLocks)
     {
       return class_createInstance(tracedConditionClass, 0);
     }
   return class_createInstance(self, 0);
-*/
 }
 
 + (void) initialize
@@ -538,14 +531,11 @@ MUNLOCK
 
 + (id) allocWithZone: (NSZone*)z
 {
-  return [super allocWithZone: z];
-/*
   if (self == baseConditionLockClass && YES == traceLocks)
     {
       return class_createInstance(tracedConditionLockClass, 0);
     }
   return class_createInstance(self, 0);
-*/
 }
 
 + (void) initialize