23240 commit by Vance King Saxbe. A