Remove the getEventHandler function
Merge branch 'master' into shared-components-0.2

* master:
  Remove the getEventHandler function