8420 commit by Vance King Saxbe. A