Revert accidental deletion of strings

Partially reverts 908238bba0f53f11151f2de2f424f994aef886f7 and
58991a3e861048d9b35462fae07246e2272e82b7.