Revert 26d17e2..6032975

This rolls back to commit 26d17e249f24098c7c01cd1697fcbea64c3a1325.
Revert 6032975..9b30731

This rolls back to commit 60329759057669eae4faba78b42da4ef5860d150.
update CDN