Fix for NB#88031 (ported from trunk r5606):