Bug 7180: (follow-up) fix regression on bug 6074