Regression in unicode characters, removing shim which is apparently now *causing* the problem instead of fixing it