and drop the rather lunatic over engineering hackery to make 6 local strings
non local

Change-Id: I619e3d6b5a2205a10407eed98eb3ca83945267e3