Reverted encoding commit