diff --git a/g10/gpg.c b/g10/gpg.c
index 4883493db..2c3cd925f 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3846,12 +3846,7 @@ main (int argc, char **argv)
     if( may_coredump && !opt.quiet )
 	log_info(_("WARNING: program may create a core file!\n"));
 
-    if (opt.flags.rfc4880bis)
-      {
-        if (opt.verbose)
-          log_info ("Note: RFC4880bis features are enabled.\n");
-      }
-    else
+    if (!opt.flags.rfc4880bis)
       {
         opt.mimemode = 0; /* This will use text mode instead.  */
       }
diff --git a/g10/keygen.c b/g10/keygen.c
index 8cd977c26..5660c8701 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -409,8 +409,6 @@ keygen_set_std_prefs (const char *string,int personal)
 
             if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB))
 	      strcat(dummy_string,"A2 ");
-            if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_EAX))
-	      strcat(dummy_string,"A1 ");
 
             if (personal)
               {