Issue #18845: removed unnecessary code