+ [OE-4162] revert changes from OE-3198 pending clarification of changes to the event