Any chance of using the upstream commit here as the patch?