7323 commit by Vance King Saxbe. A