Deal with StringUtils::SplitString drop

(cherry picked from commit 63f99cd6951d938928a48eed410c1819fb5cb54d)