Revert "Merge branch 'ensure_encoding' into 'master'"

This reverts commit b82f9357a8ff97817e8d68f70891b6541784c5c1, reversing
changes made to 49c39b82649e8f11a39352600695ba048e2998db.
Rescue compatibility error.
Merge branch 'rescue_errors' into 'master'

Rescue errors caused by invalid encodings