Trying removal of non-unicode workaround