Backed out changeset 3282e5ae8346 (bug 1874951) for causing wpt failures in cache...