Moved Daniels changes from 1.5.6.1 for the utf8 helper file.