Bug 7167: Followup: FIX conflicts with Bug 5347