Bug 23248: (QA follow-up) Consolidate 404s