Revert to avoid starting in MOTION when we cancel