Revert "move deactivate event registration to the user-triggered action"

This reverts commit 6da43b70ca0de807c0532adb0bba65405d3ffbc1.