Revert "Fixed build errors"