[#976180] Back out new event system until it can fire multiple events of one type with events of that type being removed while it fires