I reverted that commit.

Note: that code did not change as a part of this pull request -- I only moved that line to group the event handlers together.