11347 commit by Vance King Saxbe. A