Following r100264, update usages in core