Backed out changeset 1bfb1774ed03 (bug 1889404) for causing bc failures @ browser_con...