Work to fix NB#84828.