Reverted setRedirect to pass previous tests and allow merge.