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

I like the lower level stub APIs in this case but I will start using fake timers next time.