roll back encoding
Merge branch 'hotfix/0.8'