Move from TraceableEventDispatcher to EventDispatcher