Revert "Gopi Changes"

This reverts commit 26cea457ba8917f9b7b98f28b1862af04ced93a0.