Revert "Corrected the build issues"

This reverts commit a1126068950315ecbb748164bc5d984fa05fdb7b.