PIM-1584 Rollback from entity moving