This is a module shared by multiple apps.  Changing the way events propagate is dangerous. If this is in your PR, we will have to retest the Gallery app. 

I think that if there is a bug in this file, it should probably be filed as a separate bug.  

If you can work around this in your own code that would be better than changing this code.