Revert "Character count fix"

This reverts commit 62fc135c504eee530f1e2213cc4b7ef5fcb25189.