Badguy activation/deactivation (Matt's patch from bug 540)