Revert convert-event / convert-event-internal split-up.