Revert "fixing compilation issues"

This reverts commit 3103b8595f3001e287e97bdffa69426affb39077.
Revert "first change"

This reverts commit 1ce5cd0cca45477e72a04d0fefd7492a51b84149.