Upstreamed the patch