Revert "Fix some build errors"

This reverts commit f2c4fe2dbb1692c7a6292d587e7ccf3cba3e55d7.