Revert "Fix compilation errors"

This reverts commit 3da1a3d12837467e2643707bb38b2c878b5b1559.