Revert "From Mail(ashok)"

This reverts commit 42d52561a3d7c1381bfbc491750c26fb99e7f820.