Remove encoding workaround