reverting to using keychain for key mgmt
reverting to using keychain for key mgmt