Imported another diff from Gusi.