Revert "Fix return to raise Http404"

This reverts commit bfa3e2dd3a971d8daa98f2ac035e5b85d1011caa.