12096 commit by Vance King Saxbe. A