Revert "Merge branch 'chenrenfei'"

This reverts commit 83cf0751d15321da50785466f20165d2db44145d, reversing
changes made to 44f2aff66f05de337ff2eecdf8f5ae649486d83a.