You've removed calls here to handle encoding that were inserted specifically to eliminate a bug with `1.9.3`, I don't see any other work around in place so we should probably still perform the encoding protection.