rework activation and deactivation a bit for greater compatibility with add-ons