Follow up fix to remove unused validation (part 7).