Revert "File encoding and wrap width fixes"

This reverts commit 0397046eb87254388022e2efb462e05b548f16f0.
Another encoding fix attempt