C++: Delete the fix that was introduced in bb447d7174141dc518e6ce90367121280fec1d80. This is no longer needed after #5678.
C++: Delete the fix that was introduced in bb447d7174141dc518e6ce90367121280fec1d80. This is no longer needed after #5678.

github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql,github/codeql