Why are you reverting the 404 handling fix? Did you just happen to start from an older copy of the code?