The answer is "both" :).

The eventTrap is added to the sizer only by the ``gui.EventManager`` upon creation only. On an undo, this particular block of code was allowed to be tightly coupled to the current undo implementation, and knew that the OdfCanvas would have removed the event trap completely from the document.

In the new non-inline caret, the event trap is now added directly into the local user's overlay element that also contains the caret and the avatar. This means that the event trap is now restored back to it's expected location upon re-registering of the local user's caret. Hence this check would always fail as by the time ``undoManager.moveBackward(1)`` has finished, the local caret has been re-registered again.

Though the event trap no longer needs to be re-added, the focus still needs to be restored after an undo or redo.