Revert "Refactor an event binding"

This reverts commit 680ddd72b5334212b03a2f99d91309b0f5a49c5f.