fc9089d Re-add dropped patch.

Authored and Committed by limb 3 years ago
    Re-add dropped patch.