Revert "Stop double encoding things"

This reverts commit 6fd91615cd24807f1daa1e78a387e19df68574db.