This reverts commit 1e43b882ae. Seems like this causes other trouble (the redirect-later request missing?!)
1e43b882ae