Revert "Committing Shiwen's changes."

This reverts commit 1a9c41636fc578096716101890d1681155b50d0e.