patches: One more got upstreamed