internal API fix, from #20687