[#976180] Reverse event fire order back to what it was previously.