Here's the patch cherry-picked from upstream. The only difference picked up by that is the removal of an unused variable.
Here's the patch cherry-picked from upstream. The only difference picked up by that is the removal of an unused variable.