6bc016f3fa
Also, remove work-around for template type-checking issue that was fixed in #31371. Fixes #33051 PR Close #33099