Revert "String fixes"

This reverts commit 8488fec154e5cd41fa100dcf4203439f894e52b3.

Change-Id: Icb13b87d59b9c836d9821979b330f2d49d92cad0