Revert "Refactored RemoveDiacritics"

This reverts commit 3372e121c78d6ab982146ede5b26914dff5ecd35.
Revert "Revert "Refactored RemoveDiacritics""

This reverts commit d3d22674b01556c84ac5684fc509b59344fe9c77.