Remove encoding set

This is a small delta, but is based on the previous pull request.