Revert "Event listener bugfix"