Keep track of headers on our own.

The renderer changed the behavior to have the headers held protected.