Avoid unneeded redirects