Patches upstream's change