Revert "rewrite URL formats"

This reverts commit 641bde8386c0a10cef95f4a733633ea2559b69bd.