Another tweak for bug #7809.