Remove kill hack in KeychainDatabase