Don't parse headers unnecessarily
Merge pull request #5033 from wmtan/DoNotParseHeadersUnnecessarily

Don't parse headers unnecessarily