Revert "Fix building errors"

This reverts commit 3eb30d4385195539632df930e162db03fd9cb45f.