spring cleaning
Revert "remove casefolding and normalization"

This reverts commit 3f7769f32a8ad7c6a93093ef58a590ac8541a937.

Conflicts:

	Changes