Really fix issue with cdn_subdomain=False