2124: Respect add_header param, herp derp