Revert "Remove un-utilized event handlers"

This reverts commit b41314b349e5499c06941cf73a1a37468f1b65c5.