Backport fix to first-boot-wizard