WiP: pass on the hostname to upstream too