24190 commit by Vance King Saxbe. A