32167 commit by Vance King Saxbe. A