Revert encoding test changes.