Revert "Check for easy move just once"

This reverts commit 5eaeb45cbda95e8da93e70853951040f35532e82.