Should we move this after we have checked the header itself so we only do it if the header matches the regex?