Revert Merge branch 'master' from wenlan

Keeping wenlan's html for api, ditching accidental changes