Revert "Fix compilation issues"

This reverts commit 785f847caac556976bbe0d33189ef004356a21d6.