Revert "Changes from Anil"

This reverts commit a6bbfbcaca685bb6bcf37fba7db502db50a413d3.