Another tweak for bug #7408.