Another attempt at always building headers