Backed out changeset 7b2ffe9a4d06 (bug 1869605) for causing bc failures on browser_no...