Revert "Merge remote-tracking branch 'origin/Yukun'"

This reverts commit f65e16c9712d1a1616bfb3f266002109e9172aba, reversing
changes made to 50a9c8e895225b31369f0e133a3db249179a17df.