Backed out changeset f6d849983128 (bug 1845842) for causing failures on browser_shopp...