Re-enable support for old-school URLs like