Revert "Plot: fix str vs unicode bug"

This reverts commit cf0bcc9bade2cfd05b5d0075e324e71f41910267.
plot: better fix for str/unicode upper