17255 commit by Vance King Saxbe. A