Follow up r45460. More reverts, new code and messages follows with next commit.