diff --git a/agent/ChangeLog b/agent/ChangeLog
index 3669b0e43..81c979414 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-17  Moritz Schulte  <moritz@g10code.com>
+
+	* query.c: Undo change from 2004-12-05.
+
 2004-12-15  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.c [W32]: Various hacks to make it work.
diff --git a/agent/query.c b/agent/query.c
index cdf6ff259..b514f6f5e 100644
--- a/agent/query.c
+++ b/agent/query.c
@@ -152,7 +152,7 @@ start_pinentry (CTRL ctrl)
     pgmname++;
 
   argv[0] = pgmname;
-  if (ctrl && ctrl->display && !opt.keep_display)
+  if (ctrl->display && !opt.keep_display)
     {
       argv[1] = "--display";
       argv[2] = ctrl->display;
@@ -189,7 +189,7 @@ start_pinentry (CTRL ctrl)
                         NULL, NULL, NULL, NULL, NULL, NULL);
   if (rc)
     return unlock_pinentry (map_assuan_err (rc));
-  if (ctrl && ctrl->ttyname)
+  if (ctrl->ttyname)
     {
       char *optstr;
       if (asprintf (&optstr, "OPTION ttyname=%s", ctrl->ttyname) < 0 )
@@ -200,7 +200,7 @@ start_pinentry (CTRL ctrl)
       if (rc)
 	return unlock_pinentry (map_assuan_err (rc));
     }
-  if (ctrl && ctrl->ttytype)
+  if (ctrl->ttytype)
     {
       char *optstr;
       if (asprintf (&optstr, "OPTION ttytype=%s", ctrl->ttytype) < 0 )
@@ -210,7 +210,7 @@ start_pinentry (CTRL ctrl)
       if (rc)
 	return unlock_pinentry (map_assuan_err (rc));
     }
-  if (ctrl && ctrl->lc_ctype)
+  if (ctrl->lc_ctype)
     {
       char *optstr;
       if (asprintf (&optstr, "OPTION lc-ctype=%s", ctrl->lc_ctype) < 0 )
@@ -220,7 +220,7 @@ start_pinentry (CTRL ctrl)
       if (rc)
 	return unlock_pinentry (map_assuan_err (rc));
     }
-  if (ctrl && ctrl->lc_messages)
+  if (ctrl->lc_messages)
     {
       char *optstr;
       if (asprintf (&optstr, "OPTION lc-messages=%s", ctrl->lc_messages) < 0 )