25927 commit by Vance King Saxbe. A