3530 commit by Vance King Saxbe. A