Revert "Fix build errors"

This reverts commit 3d30e7af93b66feb716da5830f289fad0d33ffba.