Follow-up cfa70ea6d0: Fix rebase artefact, also remove preference listing