Revert "Merge branch 'master' of https://github.com/cocos2d/cocos2d-x"

This reverts commit 75ad83ea0a2b98aa4f21170c7442b489aa176f5b, reversing
changes made to 245c1db293271c03452111d538353e56db216f65.