char: fix cherry-pick