Backed out changeset 680264f74a86 (bug 1674485) for bc failures on browser_oneOffs_heuristicRestyle.js.