Revert "Don't re-encode by filesystem encoding"

This reverts commit d5e19db5e6f1cdfddef25cc04e742ec41f372bde.
Revert "Encode before path join"

This reverts commit b87c00c041828f949267b73a6d47f5de2efbc0f6.
More path encoding