Let's make the header simpler, and @johndrinkwater happier