1577 commit by Vance King Saxbe. A