7222 commit by Vance King Saxbe. A