Undo previous chnages regarding BusEvent