Attempt #2 at stale unit detection