Followup r111898; Do the same for the attribute whitelist.