Put IKeyId interface back the way it should be