ff18137 Update downstream patch

Authored and Committed by fmuellner 2 months ago
    Update downstream patch
    
    Also revert an upstream change that renamed a variable, so that
    the "old" revert applies cleanly again.