Break everything
Revert "Break everything"

This reverts commit 39da03587bc62ab89244c9945df4f5fb5f323350.
Refactor URL utils