Upgrade to RSA M2 (so public key parsing is easier)