Revert "better locale handling"

This reverts commit 8c3e5d6d66a5a96c1b87b26725dd46d0b85fdb72.