Reinstated the do_404 error
Merge