Revert 'Added support for CDN content servers'