27931 commit by Vance King Saxbe. A