Revert "Aravind | #00 | Fixing build."

This reverts commit 4b464de97a6afd2b2b05884445256bda3b5f6ce3.
Aravind |#00 | Fixing build again.