* Fix regressions from r24515: