Revert localization changes in #12469 #12659
Do not gorget revert this PR after #12453 is merged
Do not gorget revert this PR after #12453 is merged