[Security] Fix BC break introduces in #10694