Ticket/master/pdb 954 fallback acceptance

I still can't see a deprecation warning here when users are using the old methodology, I'm not sure if the `uses_server_urls` variable was meant to do something here in this regard?