3008 commit by Vance King Saxbe. A