Remove dependency on FXKeychain.