sage

e8cfad05 - use different patch from upstream