Comment 6 for bug 1504536