new upstream no longer requires this patch