See diffs from line 568 -- it essentially moved from outside the method to within. I believe there was associated test breakage as well