Go back to using keychain