Revert "Last two commits restored."

This reverts commit 2c8a89f854a4a90d249e161987c2178bda2d0b5b.