diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index 4aa74c0d4..062c1ffc8 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -65,12 +65,10 @@ krb5_rd_priv(krb5_context context,
       goto failure;
   }
 
-  /* XXX - Is this right? */
-
-  if (auth_context->local_subkey)
-      key = auth_context->local_subkey;
-  else if (auth_context->remote_subkey)
+  if (auth_context->remote_subkey)
       key = auth_context->remote_subkey;
+  else if (auth_context->local_subkey)
+      key = auth_context->local_subkey;
   else
       key = auth_context->keyblock;