Restore the insecure public key stuff now that I've tested it