Revert "Update addEventListener to addEventListerner2"

This reverts commit 0c61c1fb37ae6316617dca360b09a2d74fc25885.
Revert "Revert "Update addEventListener to addEventListerner2""

This reverts commit 5d06b021b40f6af13a3ef84ce3613a842fc0ec7a.
Revert "Revert "Revert "Revert "Revert "Update addEventListener to addEventListerner2"""""

This reverts commit f3efbb1abd37eccadea14e0e0cb149d8a416aaed.