Created by: PranavSenthilnathan
I fixed the merge conflict in #8983 and verified that the proxying does work. It's a very small fix, so feel free to just make these changes on the original PR/branch if that's easier for attribution or issue tracking.