Remworked the patches a bit to match PHPs behavior
Remove not needed redirection