Back out the change to spin in eviction before waiting: it doesn't seem to help in automated tests.