Re-add guard-migrate