Use cleaner way of temporary base url overriding and fallback disabling