*8158* Fixed UTF8 BOMs
*8158* Revert symlink change