Commit from Robert Patterson.