Another tweak for bug #7337.