Based on the discussion in upstreams bugtracker, I think that the attached diff should be the right way to fix this problem.
Based on the discussion in upstreams bugtracker, I think that the attached diff should be the right way to fix this problem.