Another small tweak for bug #7906.