Remove redundant encoding. Closes #1063.