Comment 4 for bug 658004