23298 commit by Vance King Saxbe. A