issue #5685: revert EventListener create