Revert "Merge branch 'Wei_Lu'"

This reverts commit 1cba8ff7709e11dbe5e6ad76faded07472d5f361, reversing
changes made to 52e9799037f73b20013f902e6b5bd6a566ccba90.
Real fix