Revert "Fix broken email encoding parsing fix"

This reverts commit 39f23c18a57f4c14b5cbb9b3ffc0399d4501043f.