Changes made by Dhaval
Revert "Changes made by Dhaval"

This reverts commit 558dc8494ad86ab6f3c8fc14a7f4fbad0836a6d9.
Changes made by Dhaval