diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc
index fc051cdcd..b9d706bac 100644
--- a/winsup/cygwin/cygthread.cc
+++ b/winsup/cygwin/cygthread.cc
@@ -310,19 +310,6 @@ cygthread::terminate_thread ()
   if (ev && !(terminated = !IsEventSignalled (ev)))
     ResetEvent (ev);
 
-  if (!wincap.terminate_thread_frees_stack ())
-    {
-      MEMORY_BASIC_INFORMATION m;
-      memset (&m, 0, sizeof (m));
-      VirtualQuery (stack_ptr, &m, sizeof m);
-
-      if (!m.RegionSize)
-	system_printf ("m.RegionSize 0?  stack_ptr %p", stack_ptr);
-      else if (!VirtualFree (m.AllocationBase, 0, MEM_RELEASE))
-	debug_printf ("VirtualFree of allocation base %p<%p> failed, %E",
-		       stack_ptr, m.AllocationBase);
-    }
-
   if (is_freerange)
     free (this);
   else
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index eb9f5c0a1..f94390d81 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -25,7 +25,6 @@ wincaps wincap_xpsp2 __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:false,
   has_broken_alloc_console:false,
   has_console_logon_sid:false,
-  terminate_thread_frees_stack:false,
   has_precise_system_time:false,
   has_microsoft_accounts:false,
   has_broken_rtl_query_process_debug_information:false,
@@ -43,7 +42,6 @@ wincaps wincap_2003 __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:false,
   has_broken_alloc_console:false,
   has_console_logon_sid:false,
-  terminate_thread_frees_stack:false,
   has_precise_system_time:false,
   has_microsoft_accounts:false,
   has_broken_rtl_query_process_debug_information:true,
@@ -61,7 +59,6 @@ wincaps wincap_vista __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:true,
   has_broken_alloc_console:false,
   has_console_logon_sid:false,
-  terminate_thread_frees_stack:true,
   has_precise_system_time:false,
   has_microsoft_accounts:false,
   has_broken_rtl_query_process_debug_information:false,
@@ -79,7 +76,6 @@ wincaps wincap_7 __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:true,
   has_broken_alloc_console:true,
   has_console_logon_sid:true,
-  terminate_thread_frees_stack:true,
   has_precise_system_time:false,
   has_microsoft_accounts:false,
   has_broken_rtl_query_process_debug_information:false,
@@ -97,7 +93,6 @@ wincaps wincap_8 __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:false,
   has_broken_alloc_console:true,
   has_console_logon_sid:true,
-  terminate_thread_frees_stack:true,
   has_precise_system_time:true,
   has_microsoft_accounts:true,
   has_broken_rtl_query_process_debug_information:false,
@@ -115,7 +110,6 @@ wincaps wincap_10 __attribute__((section (".cygwin_dll_common"), shared)) = {
   has_gaa_largeaddress_bug:false,
   has_broken_alloc_console:true,
   has_console_logon_sid:true,
-  terminate_thread_frees_stack:true,
   has_precise_system_time:true,
   has_microsoft_accounts:true,
   has_broken_rtl_query_process_debug_information:false,
@@ -133,7 +127,6 @@ wincaps wincap_10_1511 __attribute__((section (".cygwin_dll_common"), shared)) =
   has_gaa_largeaddress_bug:false,
   has_broken_alloc_console:true,
   has_console_logon_sid:true,
-  terminate_thread_frees_stack:true,
   has_precise_system_time:true,
   has_microsoft_accounts:true,
   has_broken_rtl_query_process_debug_information:false,
diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/wincap.h
index 391cce74c..e9ac86203 100644
--- a/winsup/cygwin/wincap.h
+++ b/winsup/cygwin/wincap.h
@@ -18,7 +18,6 @@ struct wincaps
   unsigned has_gaa_largeaddress_bug			: 1;
   unsigned has_broken_alloc_console			: 1;
   unsigned has_console_logon_sid			: 1;
-  unsigned terminate_thread_frees_stack			: 1;
   unsigned has_precise_system_time			: 1;
   unsigned has_microsoft_accounts			: 1;
   unsigned has_broken_rtl_query_process_debug_information : 1;
@@ -61,7 +60,6 @@ public:
   bool	IMPLEMENT (has_gaa_largeaddress_bug)
   bool	IMPLEMENT (has_broken_alloc_console)
   bool	IMPLEMENT (has_console_logon_sid)
-  bool	IMPLEMENT (terminate_thread_frees_stack)
   bool	IMPLEMENT (has_precise_system_time)
   bool	IMPLEMENT (has_microsoft_accounts)
   bool	IMPLEMENT (has_broken_rtl_query_process_debug_information)