Backport dpkg fix