Fix regression from #4794