Backout 483210d830f0 (bug 984537) for memory regressions.