30684 commit by Vance King Saxbe. A