You might have noticed that there is a commit by gorhill for the issue mentioned above. So it seems that he's working on a solution.