Back out changes for UTF-8 encoding.