A tweak for bug #8251.