diff --git a/build/config_headers/support_kit_config.h b/build/config_headers/support_kit_config.h
new file mode 100644
index 0000000000..a907b302e3
--- /dev/null
+++ b/build/config_headers/support_kit_config.h
@@ -0,0 +1,8 @@
+#ifndef SUPPORT_KIT_CONFIG_H
+#define SUPPORT_KIT_CONFIG_H
+
+
+#define	BLOCKER_ALWAYS_SEMAPHORE_STYLE	0
+
+
+#endif	// SUPPORT_KIT_CONFIG_H
diff --git a/src/kits/support/Locker.cpp b/src/kits/support/Locker.cpp
index af7827a0ab..48c0b99dbb 100644
--- a/src/kits/support/Locker.cpp
+++ b/src/kits/support/Locker.cpp
@@ -12,6 +12,7 @@
 #include <Locker.h>
 #include <SupportDefs.h>
 
+#include "support_kit_config.h"
 
 //
 // Data Member Documentation:
@@ -188,7 +189,7 @@ BLocker::InitLocker(const char *name, bool benaphore)
 	if (name == NULL)
 		name = "some BLocker";
 
-	if (benaphore) {
+	if (benaphore && !BLOCKER_ALWAYS_SEMAPHORE_STYLE) {
 		// Because this is a benaphore, initialize the benaphore count and
 		// create the semaphore.  Because this is a benaphore, the semaphore
 		// count starts at 0 (ie acquired).