Remove deprecated explicit encoded annotations.
Merge pull request #628 from square/jw/remove-deprecated-methods

Remove deprecated explicit encoded annotations.