Hygiene: remove unused i18n hack

Change-Id: I32519948da4dfca4efa5dacd9f98956f5e5a25d2
Merge "Hygiene: remove unused i18n hack"