c73819371c
These changes to redirect handling appear to have caused #13208. This PR reverts the redirect changes to give us time to investigate.