Improve localization; undo some previous changes