Has this patch been sent upstream?