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

This reverts commit 2ccda964fdbe37cd428fb280b660b84c708aebc5.