resolve now-unused parameter from #21642 fix