diff --git a/agent/command-ssh.c b/agent/command-ssh.c
index 2c18796bc..ce2b5df9d 100644
--- a/agent/command-ssh.c
+++ b/agent/command-ssh.c
@@ -2495,11 +2495,11 @@ ssh_send_available_keys (ctrl_t ctrl, estream_t key_blobs, u32 *key_counter_p)
   if (err)
     return err;
 
-  /* First, get information keys available on card(s). */
+  /* First, get information keys available on cards on-line. */
   keyinfo_on_cards = get_ssh_keyinfo_on_cards (ctrl);
 
-  /* Then, look at all keys with "OPENPGP.3" idstring.  */
   /* Look at all the registered and non-disabled keys, in sshcontrol.  */
+  /* And, look at all keys with "Use-for-ssh:" flag.  */
   dirname = make_filename_try (gnupg_homedir (),
                                GNUPG_PRIVATE_KEYS_DIR, NULL);
   if (!dirname)
diff --git a/agent/findkey.c b/agent/findkey.c
index b0a941078..e0db5095c 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1458,8 +1458,7 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
 
   if (for_ssh)
     {
-      /* Use-for-ssh: yes          */
-      /* Token: <SERIALNO> <IDSTR> */
+      /* Use-for-ssh: yes */
       const char *p;
       int is_ssh = 0;
 
@@ -1470,19 +1469,6 @@ public_key_from_file (ctrl_t ctrl, const unsigned char *grip,
           && !strcmp (p, "yes"))
         is_ssh = 1;
 
-      if ((p = nvc_get_string (keymeta, "Token:")))
-        {
-          while (*p && !spacep (p))
-            p++;
-
-          if (*p)
-            {
-              p++;
-              if (!strcmp (p, "OPENPGP.3"))
-                is_ssh = 1;
-            }
-        }
-
       nvc_release (keymeta);
       keymeta = NULL;