Revert StringUtils changes, Code review changes