Re #10817 lost changes again