Rebased debian/patches/better-config-defaults.patch, deleted other patches.