Abort any existing patches when applying
Migrate the crop fixes by @Aikar to the core patch.