I have been exposed to the same issue.
Is it possible to merge this patch with the official repo?