part of the patch is no longer necessary

fixed upstream