Merge pull request #19659 from demeritcowboy/revert-18782