23054 commit by Vance King Saxbe. A