Revert hacky code to fix unicode errors