6997 commit by Vance King Saxbe. A