Revert "compilation warning fix"

This reverts commit d94dcb1e4ca81e68c83ae174b41abfa9d267201f.
Revert "compilation warkaround"

This reverts commit 9c7d64223cf7b98fbcf75bb4925cf381e389862c.