Comment 8 for bug 1644538

Thanks for looking into these. Everything you've said sounds reasonable. I'm going to leave the snakeoil patch as-is in Ubuntu for now for the sake of making progress, but I will make a note to look at this again when we next merge.