Work to fix NB#82451.