More chef upgrade workarounds.