[Revert] Revert commit due to wrong merge method

[morningman]

Before I used the wrong merge method to merge some PR.
As a result, these PRs generate multiple commits and are scattered to different locations
in commit log.

So I decided to revert these PRs, and then "revert" these reverts, so that we can get
a complete commit corresponding to the PRs.