[PATCH 0/2] Improve migration by backing off earlier