1249 commit by Vance King Saxbe. A