Revert "Review1"

This reverts commit 4996e234274de83d8eddaa0d3eab81e5124947db.
Revert "Review3"

This reverts commit 98e95125a078630dc191c44df34e1942f44bada7.