Cherrypick gsamokovarov/no-url-no-urlroot