This is a tweak for bug #8062.