These call to LegacyStringUtils can be replaced too