Fix race which occasionally caused deleted devices to reappear.