diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 6bc74c4fd..0c158f2c8 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygheap.h (cygheap_user::deimpersonate): Always RevertToSelf.
+
 2007-01-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* net.cc (gai_errmap): Add EAI_OVERFLOW entry.  Fix formatting.
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/cygheap.h
index f33feb546..f15d6a8ae 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/cygheap.h
@@ -181,8 +181,7 @@ public:
   HANDLE token () { return current_token; }
   void deimpersonate ()
   {
-    if (issetuid ())
-      RevertToSelf ();
+    RevertToSelf ();
   }
   bool reimpersonate ()
   {