21812 commit by Vance King Saxbe. A