Also avoid partition-related hangs here.