21260 commit by Vance King Saxbe. A