backout bug 1029943 for performance regressions (see bug 1066515)