reverting of: "adding optional event id for tracking"