Fix UTF paths

This reverts commit 1bef1b961dbf59af780cf47b837f9d67d6978460.