Revert "URL TLC"

This reverts commit d98cbe21d22e9dced2b0713640319309f0f5c28c.