Revert "Optimize string addition"

This reverts commit 02975fa15a26c87d534fee1834b29342fa0b8419.