Revert "Another try to fix :)"

This reverts commit 37d44361917d5f1ab3d5293f7ec04f8430d5c44a.
Revert "Try to final compile fix"

This reverts commit 19a853a654902172d5723cadb8f3d86e41fda22c.