simplify restore of saved locale from the configuration

Change-Id: Iea1842e56233bd7f45eba4307c2016a099a8bdd2