Changes to fix NB#80521.