Revert "Patch for utf-8 decomposed characters"

This reverts commit 4bff227eff623eca38bfcd7d7750c505a51763b3.