#5822: Undo accidential duplicity retirement