issue #20864: removed commented-out code