Patch unneeded since it was merged upstream.