Move EDTHandlerInvocationi back.