Has the patch been report upstream? If not, please do and reference upstream bug URL in comments.