Revert "DNS 404 hijack fix"

This reverts commit 3ef9008bf24e38ed6f54c94a5cf9cfece6046349.
Revert "Revert "DNS 404 hijack fix""

This reverts commit 1772e50e0535d46c8798c215b6a3027f1346713c.