Issue #24790: Remove extraneous code (which also create 2 & 3 conflicts).
1 file changed