Slight tweak for bug #8355.