Undo the core modification and use the proper GoingDownEvent (suggested by MurphyMc)