Can we get this patch merged upstream instead?