Revert "Merge branch 'Kishan'"

This reverts commit a0293645b80d13198389222527258fbc1fda979f, reversing
changes made to 937e36ab772bc2cebeffce10937c6889ed9bd929.
Revert "Merge branch 'rahul'"

This reverts commit 937e36ab772bc2cebeffce10937c6889ed9bd929, reversing
changes made to 318145f51e15fb0039c300df4b8d04d710e49cb4.