The upstream fix is 79764ec772bc1346441ae1c4b1f3bd1991d634e8, which is a revert of a commit. Now the backport was pushed to my stable/for-next.