Attempt to fix problem where events can get out of order on remove/replace when a different EventExecutor is used