It is indeed a good thing to do but for consistency, it must be done for
all events. As this is not possible now, I prefer to revert it for now.