Comment 6 for bug 636021