oops. Previous cherry-pick not valid. std:string does not
leak memory.