Remove nul-concatenating of headers