Avoid changing provider configuration in request

Also includes:

 - Make conditional hostnames even more optional