Has this patch been submitted upstream? Why is it needed?