Your change #15321 (http: sending the original url scheme (or best guess) upstream.) introduced a runtime guarded feature. It has been 6 months since the new code has been exercised by default, so it's time to remove the old code path. This issue tracks source code cleanup so we don't forget.