21327 commit by Vance King Saxbe. A