Reverted changes to event listeners to maintain backwards compatibility.