Remove dev hack in KeychainDatabase