Revert "Fix compilation issues"

This reverts commit e10eef8f627b131e8a9dbae8245cd1db12e1b9d3.