Bug 6699 follow-up