Comment 4 for bug 1598135

Removing assignee and moving back to Triaged as there has been no progress in some time. Please re-add yourself if you want to continue the work. The patch looks almost there, it just needs rebasing afaict.