holy shit I'm an idiot. I need tests :x
Merge remote-tracking branch 'origin/cleanup_headers_parsing'