Let's pick up upstream's solution (which does the same thing as my patch but in a different way) in commit 3f811a611185a3bdbb6b6d4c19590bd26ae1dc82
Let's pick up upstream's solution (which does the same thing as my patch but in a different way) in commit 3f811a611185a3b dbb6b6d4c19590b d26ae1dc82