Revert "Merge pull request #5106 from shenweip/patch-1"

This reverts commit 91a355b642beac87361dbcb4fb70f26c533c7d98, reversing
changes made to 82395001eca23bed9a8fe959af510bd6cdd061bf.