Revert changes to event_type behavior