Revert "Define EncodingError unless it's defined already"

Turns out I'm silly and these tests were failing in 1.8 mode,
not 1.9+

This reverts commit 26d06d6d78d2f867cee3e37284617a9184b09b0f.