diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 07bdb3744..4bf59b629 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-18  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uinfo.cc (uinfo_init): Deimpersonate, don't reimpersonate, if
+	not in a setuid condition.
+
 2009-10-13  Eric Blake  <ebb9@byu.net>
 
 	* external.cc (cygwin_internal): Use va_end.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index a480f9979..51fd8ad76 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -155,7 +155,7 @@ uinfo_init ()
   cygheap->user.curr_token_is_restricted = false;
   cygheap->user.setuid_to_restricted = false;
   cygheap->user.set_saved_sid ();	/* Update the original sid */
-  cygheap->user.reimpersonate ();
+  cygheap->user.deimpersonate ();
 }
 
 extern "C" int