CORE-4338: Fixed URL imports...again. Sigh.