Reverted encoding changes