7771b77 Replace a downstream patch with a backported upstream commit

Authored and Committed by music a year ago
    Replace a downstream patch with a backported upstream commit
    
        
file modified
+7 -6