This reverts commit 078249677bbaf042d83df5ed61195400fce1b1ca.
Merge pull request !317 from xingyu/dev