Revert "Merge remote-tracking branch 'origin/Jiahao-Chen'"

This reverts commit bf522b152acc8209b02f2088014ecccd3942770d, reversing
changes made to 49300a6e3a9b71247144c5331eb2709afed8baf1.