3376 commit by Vance King Saxbe. A