backout changes to StringUtils