Reverted change which caused incompatible encodings