Reverted breaking change for issue #201

To be grouped with other breaking changes for major version release.
Also, minor formatting fix in src/eventhandler.js