Reorder EGamma patch fuggery to prevent recipe breakage