Adds correct header buffering.

Turns out it isn't a bug, as much as a semantic difference between 3.2 and 3.3.