Revert "changes suggeted by Sejal"

This reverts commit 828f070f323ccfe12fb4c89202363ecd193419b4.