Rolled back changes for stringr