Comment 9 for bug 1604036