Merge pull request !1011 from 芋道源码/develop
This reverts commit 5632c515271943200f4b189204947632bf77ccc9.