16864 commit by Vance King Saxbe. A