reverting to using keychain for key mgmt