Bug 847851 - change event hook to addEventListener