Revert "Use simpler diacritics map"

This reverts commit 868ae51a4da1d14b18b7a15c66136b33872fff40.