diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index cccc8b17d..41922169b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,6 +1,11 @@
+2011-11-27  Christopher Faylor  <me.cygwin2011@cgf.cx>
+
+	* init.cc (dll_entry): Revert previous change since it caused
+	inexplicable fork problems.
+
 2011-11-26  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
-	* init.cc (remove): Don't bother calling through thread removal
+	* init.cc (dll_entry): Don't bother calling through thread removal
 	cleanup if we are exiting.
 
 2011-11-26  Christopher Faylor  <me.cygwin2011@cgf.cx>
diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc
index 480a41ea3..107d037f9 100644
--- a/winsup/cygwin/init.cc
+++ b/winsup/cygwin/init.cc
@@ -150,7 +150,6 @@ dll_entry (HANDLE h, DWORD reason, void *static_load)
       break;
     case DLL_THREAD_DETACH:
       if (dll_finished_loading
-	  && exit_state < ES_FINAL
 	  && (PVOID) &_my_tls > (PVOID) &wow64_test_stack_marker
 	  && _my_tls.isinitialized ())
 	_my_tls.remove (0);