Comment 7 for bug 954500