unidecode workaround

Change-Id: Ife97e2c8ed59bb7e72a5f1112de8a4e61d2d70f8