21810 commit by Vance King Saxbe. A