Revert "Updated URL parsing"

This reverts commit 78d8ac00070f7cc1d2dd2e9352fbd3e3feea39ef.