Return from cancelled and move this back out, maybe, to keep truer to the original diff?