25059 commit by Vance King Saxbe. A