Comment 7 for bug 636021