Revert "Revised changes"

This reverts commit f76334054b183a691dbcc2d478b61b3c2c5713bc.