Revert "3.1.17 fix strings"

This reverts commit b6c68e72009e232818099a4bf26bd936588ba568.
4.1.17 fix strings