Revert "Merge pull request #1 from Anudeepv/HW/cv1"

This reverts commit 6e3f59a3d9a950b2890d60da073b2cee8194c278, reversing
changes made to 4e81ec5dea041805d51c72f7e53df13ef2646c8d.