We really should NOT change the current behaviour because of compatiblity reasons.

But then, if we clearly agree on the correct header values, I do not object adding a new commandline option to enable that feature on demand.