Comment 14 for bug 1647485

This is still being discussed upstream, so let's get to an agreement there first, land it in upstream master, and then backport the change. Note that there is not much point with debdiffs, it's easier to cherry-pick the fix directly into the packaging branches with gbp pq and debian/git-cherry-pick.