Work to fix NB#61649: