backout 1acaa42690a6 for memory regressions