Removed non-unicode workaround