Can we kill this and use the existing header instead?