re-apply change 1f11d9d4d4e123de5d3b9f38d97439e0ad56187d (httpbis references)