Comment 14 for bug 1734856

Thanks for the info Nikunj.
That means we can likely soon pick it up as a sync from Debian again.
But for now can fix it by picking your changes.