Revert "Fix compile time issues, fix some formatting"
Revert "Fix compile time issues, fix some formatting"

This reverts commit 65a901810d0d67921eda532fc01571dbbea1f06e.

priyakchari/test-file,priyakchari/test-file