Revert "Workaround for UnicodeDecodeError."

This reverts commit 699cd870da11214c814212fdce27ec6b21998719.