Comment 15 for bug 1504536