Comment 3 for bug 1779331

Accepting this as is, but I'm a bit worried that the patches haven't been actually accepted upstream yet? At least looking at Jira, the bug is still 'Triaged', with only comments approving that it 'WFM' (which is why I'm allowing this to get approved, since that's still better than not building at all).