Revert "Revert to old redirect"

This reverts commit 0b5732be8b3a23a63682eec423c3e6470bb6c534.
Revert "Changed redirect method"

This reverts commit d5285d5709ba039eab5d7dcbd8dafdf42e8ca957.