Backport a debian change