Rebirth should be removed on ressurect instead of on-death

Let’s say you have the perk/annointment that let’s you keep your buffs on deaths (Destiny Bond). My creature has rebirth, playing as fanatic, and my godspawn gets killed. With one of the class perk, the godspawn should revive as the avatar but it loses rebirth.

Should rebirth be removed on death (regardless of destiny bond) if the creature is revived by a trait or something else? Code wise, I think it would depend on which reviving trigger gets triggered first but I think rebirth purposely gets removed on death regardless.