r2837: When renaming a non-UTF8 file, still assume the directory is valid UTF-8