r20477: get rid of the spcial case for unicode strings