Revert "Fix build errors"

This reverts commit 40f206c797654dee294fec6c103076ed3b13376c.