Change URL, at least until the merge upsteam