Revert strings

This also cherry-picks a fix for functional tests, which were broken.

/cc @jrgm