Revert "Fix build errors"

This reverts commit f6ca5b52ede1cc5d6264abd752375606fc5b84f0.