Cleaned up KeyRig25 patch.