Removed useless code, now redirects before load
Revert "Removed useless code, now redirects before load"

This reverts commit 36f248f7e6b8f8f924f8482a93501ca0ecc9dda7.