25013 commit by Vance King Saxbe. A