diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 908ed317a..66659206a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,7 +1,11 @@
+2003-02-06  Christopher Faylor  <cgf@redhat.com>
+
+	* heap.cc (heap_init): Remove debugging code.
+
 2003-02-06  Pierre Humblet  <pierre.humblet@ieee.org>
 
 	* security.h: Introduce names UNKNOWN_UID and UNKNOWN_GID and delete
-	declaration of is_grp_member. 
+	declaration of is_grp_member.
 	* uinfo.cc (internal_getlogin): Use UNKNOWN_GID.
 	* passwd.cc (pwdgrp::read_passwd): Use UNKNOWN_UID.
 	* grp.cc (pwdgrp::read_group): Change group name to provide better
diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc
index 19ce3f875..fb1e37c89 100644
--- a/winsup/cygwin/heap.cc
+++ b/winsup/cygwin/heap.cc
@@ -69,8 +69,6 @@ heap_init ()
 
       /* Loop until we've managed to reserve an adequate amount of memory. */
       char *p;
-MEMORY_BASIC_INFORMATION m;
-(void) VirtualQuery (cygheap->user_heap.base, &m, sizeof (m));
       for (;;)
 	{
 	  p = (char *) VirtualAlloc (cygheap->user_heap.base, reserve_size,
@@ -80,18 +78,6 @@ MEMORY_BASIC_INFORMATION m;
 	  if ((reserve_size -= page_const) <= allocsize)
 	    break;
 	}
-      if (p == NULL)
-{
-system_printf ("unable to allocate heap %p, chunk %u, reserve %u, alloc %u, %E",
-cygheap->user_heap.base, cygheap->user_heap.chunk,
-reserve_size, allocsize);
-system_printf ("base %p mem alloc base %p, state %p, size %d, %E",
-cygheap->user_heap.base, m.AllocationBase, m.State, m.RegionSize);
-error_start_init ("h:/gdbtest/gdb.exe < con > con"); try_to_debug ();
-	api_fatal ("unable to allocate heap %p, chunk %u, reserve %u, alloc %u, %E",
-		   cygheap->user_heap.base, cygheap->user_heap.chunk,
-		   reserve_size, allocsize);
-}
       if (p != cygheap->user_heap.base)
 	api_fatal ("heap allocated but not at %p", cygheap->user_heap.base);
       if (!VirtualAlloc (cygheap->user_heap.base, allocsize, MEM_COMMIT, PAGE_READWRITE))