The option is not meant to remove the headers completly, it's just a matter of *when* they are added.

But if your patch does what you want it's all fine for you I guess :)

/Richard