1216 commit by Vance King Saxbe. A