Has this problem been reported upstream?
If so add a note that this patch can be removed in the next version.