8769 commit by Vance King Saxbe. A