Bug 821065 - Add wildcard event listeners, remove hacks that were work arounds fro this