Revert "Merge pull request #2 from drdk/feature/rewrite-urls"

This reverts commit 6d6060220c35053f489712ddf9bb4eea9e603a86, reversing
changes made to 03157f083c2cad18b2d241bf66cab4c669696f38.
Revert "Merge pull request #1 from drdk/feature/rewrite-urls"

This reverts commit 03157f083c2cad18b2d241bf66cab4c669696f38, reversing
changes made to 58dc349e8253d319073a55a9fbc1148d9c8813f0.