My last attempt to fix a race in forcing eviction didn't work, try again.