8604 commit by Vance King Saxbe. A