Roll back Vishal's fireEvent optimization since Lanica reported it didn't improve performance, and it was considered too risky.