Revert "another str_combine_n application"

This reverts commit ccfb5fa65eace88deec81243319e9b83bea826ad.

(This was applied in the wrong branch!)
Merge branch 'master' into 2.x