Backed out changeset 9ba2a9dc8abb (bug 940820) for browser-chrome test failures