Bug 1054184 - Don't clear active targets right away +shepherd