Revert "Optimize syntax for string/number type comparison"

This reverts commit 6badffccac66e3835e91493dfe226d204a189ed8.
Fix lint error