Comment 2 for bug 1504058