Follow changes from #9812