Index: dll/win32/kernel32/client/file/npipe.c
===================================================================
--- dll/win32/kernel32/client/file/npipe.c	(revision 57436)
+++ dll/win32/kernel32/client/file/npipe.c	(working copy)
@@ -14,7 +14,7 @@
 #include <debug.h>
 DEBUG_CHANNEL(kernel32file);
 
-//#define USING_PROPER_NPFS_WAIT_SEMANTICS
+#define USING_PROPER_NPFS_WAIT_SEMANTICS
 
 /* GLOBALS ********************************************************************/
 
Index: drivers/filesystems/npfs/create.c
===================================================================
--- drivers/filesystems/npfs/create.c	(revision 57436)
+++ drivers/filesystems/npfs/create.c	(working copy)
@@ -13,7 +13,7 @@
 #define NDEBUG
 #include <debug.h>
 
-//#define USING_PROPER_NPFS_WAIT_SEMANTICS
+#define USING_PROPER_NPFS_WAIT_SEMANTICS
 
 /* FUNCTIONS *****************************************************************/
 
Index: drivers/filesystems/npfs/fsctrl.c
===================================================================
--- drivers/filesystems/npfs/fsctrl.c	(revision 57436)
+++ drivers/filesystems/npfs/fsctrl.c	(working copy)
@@ -15,7 +15,7 @@
 #define NDEBUG
 #include <debug.h>
 
-//#define USING_PROPER_NPFS_WAIT_SEMANTICS
+#define USING_PROPER_NPFS_WAIT_SEMANTICS
 
 /* FUNCTIONS *****************************************************************/