This should be a quick fix for ATR-28990: we were decorating some info to EventInfo conditionally.
Not tested, thus still a draft.