fixup! MDL-44164 Correct charmap dleegation
fixup! MDL-44164 Ad back remoed comments