Bug 6554 QA Followup